buffet: Remove 'chromeos' namespace and move everything to buffet NS
As discussed, moved all the classes out of chromeos namespace into
'buffet.
Also fixed a number of cpplint's warnings.
BUG=None
TEST=Everything still compiles and unit tests succeed.
Change-Id: Ide864acb2504627404966727f66d353af60e531d
Reviewed-on: https://chromium-review.googlesource.com/198971
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/mime_utils.h b/buffet/mime_utils.h
index 44f65c8..999b677 100644
--- a/buffet/mime_utils.h
+++ b/buffet/mime_utils.h
@@ -5,51 +5,53 @@
#ifndef BUFFET_MIME_UTILS_H_
#define BUFFET_MIME_UTILS_H_
-#include <base/basictypes.h>
#include <string>
+#include <utility>
#include <vector>
-namespace chromeos {
+#include <base/basictypes.h>
+
+namespace buffet {
namespace mime {
namespace types {
// Main MIME type categories
- extern const char kApplication[]; // application
- extern const char kAudio[]; // audio
- extern const char kImage[]; // image
- extern const char kMessage[]; // message
- extern const char kMultipart[]; // multipart
- extern const char kText[]; // test
- extern const char kVideo[]; // video
+ extern const char kApplication[]; // application
+ extern const char kAudio[]; // audio
+ extern const char kImage[]; // image
+ extern const char kMessage[]; // message
+ extern const char kMultipart[]; // multipart
+ extern const char kText[]; // test
+ extern const char kVideo[]; // video
}
namespace parameters {
// Common MIME parameters
- extern const char kCharset[]; // charset=...
+ extern const char kCharset[]; // charset=...
}
namespace image {
// Common image MIME types
- extern const char kJpeg[]; // image/jpeg
- extern const char kPng[]; // image/png
- extern const char kBmp[]; // image/bmp
- extern const char kTiff[]; // image/tiff
- extern const char kGif[]; // image/gif
+ extern const char kJpeg[]; // image/jpeg
+ extern const char kPng[]; // image/png
+ extern const char kBmp[]; // image/bmp
+ extern const char kTiff[]; // image/tiff
+ extern const char kGif[]; // image/gif
}
namespace text {
// Common text MIME types
- extern const char kPlain[]; // text/plain
- extern const char kHtml[]; // text/html
- extern const char kXml[]; // text/xml
+ extern const char kPlain[]; // text/plain
+ extern const char kHtml[]; // text/html
+ extern const char kXml[]; // text/xml
}
namespace application {
// Common application MIME types
- extern const char kOctet_stream[]; // application/octet-stream
- extern const char kJson[]; // application/json
- extern const char kWwwFormUrlEncoded[]; // application/x-www-form-urlencoded
+ extern const char kOctet_stream[]; // application/octet-stream
+ extern const char kJson[]; // application/json
+ extern const char kWwwFormUrlEncoded[]; // application/x-www-form-urlencoded
}
typedef std::vector<std::pair<std::string, std::string>> Parameters;
@@ -97,7 +99,7 @@
std::string GetParameterValue(const std::string& mime_string,
const std::string& paramName);
-} // namespace mime
-} // namespace chromeos
+} // namespace mime
+} // namespace buffet
-#endif // BUFFET_MIME_UTILS_H_
+#endif // BUFFET_MIME_UTILS_H_