Fix translate namespace

Translate is turned into a component, classes and functions
have to be moved to the translate:: namespace.

BUG=331782
TEST=components_unittests:unit_tests --gtest_filter=Translate*
TBR=thakis

Review URL: https://codereview.chromium.org/378253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284742 0039d316-1c4b-4281-b951-d872f2087c98

43 files changed, 269 insertions, 89 deletions

diff --git a/components/translate/content/browser/content_translate_driver.cc b/components/translate/content/browser/content_translate_driver.cc
index 029976c..429e8cb 100644
--- a/components/translate/content/browser/content_translate_driver.cc
+++ b/components/translate/content/browser/content_translate_driver.cc
@@ -15,6 +15,8 @@
 #include "content/public/common/referrer.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 ContentTranslateDriver::ContentTranslateDriver(
     content::NavigationController* nav_controller)
     : navigation_controller_(nav_controller),
@@ -105,3 +107,5 @@ void ContentTranslateDriver::OpenUrlInNewTab(const GURL& url) {
                                 false);
   navigation_controller_->GetWebContents()->OpenURL(params);
 }
+
+}  // namespace translate
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index 813396f..bae58bb 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -13,6 +13,8 @@ class NavigationController;
 class WebContents;
 }
 
+namespace translate {
+
 // Content implementation of TranslateDriver.
 class ContentTranslateDriver : public TranslateDriver {
  public:
@@ -62,4 +64,6 @@ class ContentTranslateDriver : public TranslateDriver {
   DISALLOW_COPY_AND_ASSIGN(ContentTranslateDriver);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CONTENT_BROWSER_CONTENT_TRANSLATE_DRIVER_H_
diff --git a/components/translate/content/common/translate_messages.h b/components/translate/content/common/translate_messages.h
index 4fbcf29..d818611 100644
--- a/components/translate/content/common/translate_messages.h
+++ b/components/translate/content/common/translate_messages.h
@@ -12,9 +12,9 @@
 
 #define IPC_MESSAGE_START TranslateMsgStart
 
-IPC_ENUM_TRAITS(TranslateErrors::Type)
+IPC_ENUM_TRAITS(translate::TranslateErrors::Type)
 
-IPC_STRUCT_TRAITS_BEGIN(LanguageDetectionDetails)
+IPC_STRUCT_TRAITS_BEGIN(translate::LanguageDetectionDetails)
   IPC_STRUCT_TRAITS_MEMBER(time)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(content_language)
@@ -53,12 +53,14 @@ IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_TranslateAssignedSequenceNumber,
                     int /* page_seq_no */)
 
 // Notification that the language for the tab has been determined.
-IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_TranslateLanguageDetermined,
-                    LanguageDetectionDetails /* details about lang detection */,
-                    bool /* whether the page needs translation */)
+IPC_MESSAGE_ROUTED2(
+    ChromeViewHostMsg_TranslateLanguageDetermined,
+    translate::LanguageDetectionDetails /* details about lang detection */,
+    bool /* whether the page needs translation */)
 
 // Notifies the browser that a page has been translated.
-IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_PageTranslated,
-                    std::string           /* the original language */,
-                    std::string           /* the translated language */,
-                    TranslateErrors::Type /* the error type if available */)
+IPC_MESSAGE_ROUTED3(
+    ChromeViewHostMsg_PageTranslated,
+    std::string /* the original language */,
+    std::string /* the translated language */,
+    translate::TranslateErrors::Type /* the error type if available */)
diff --git a/components/translate/core/browser/language_state.cc b/components/translate/core/browser/language_state.cc
index 14976fc..d7b65f8 100644
--- a/components/translate/core/browser/language_state.cc
+++ b/components/translate/core/browser/language_state.cc
@@ -7,6 +7,8 @@
 #include "base/logging.h"
 #include "components/translate/core/browser/translate_driver.h"
 
+namespace translate {
+
 LanguageState::LanguageState(TranslateDriver* driver)
     : is_page_translated_(false),
       translate_driver_(driver),
@@ -110,3 +112,5 @@ void LanguageState::SetIsPageTranslated(bool value) {
   if (is_page_translated_)
     SetTranslateEnabled(true);
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/language_state.h b/components/translate/core/browser/language_state.h
index 6aefc2e..4bd7f4b 100644
--- a/components/translate/core/browser/language_state.h
+++ b/components/translate/core/browser/language_state.h
@@ -9,6 +9,8 @@
 
 #include "base/basictypes.h"
 
+namespace translate {
+
 class TranslateDriver;
 
 // This class holds the language state of the current page.
@@ -121,4 +123,6 @@ class LanguageState {
   DISALLOW_COPY_AND_ASSIGN(LanguageState);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_LANGUAGE_STATE_H_
diff --git a/components/translate/core/browser/language_state_unittest.cc b/components/translate/core/browser/language_state_unittest.cc
index efc3649..ae7be32 100644
--- a/components/translate/core/browser/language_state_unittest.cc
+++ b/components/translate/core/browser/language_state_unittest.cc
@@ -10,6 +10,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 namespace {
 
 const std::string kHtmlMimeType = "text/html";
@@ -143,3 +145,5 @@ TEST(LanguageStateTest, Driver) {
   EXPECT_TRUE(language_state.translate_enabled());
   EXPECT_TRUE(driver->on_translate_enabled_changed_called());
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/options_menu_model.cc b/components/translate/core/browser/options_menu_model.cc
index 1bed639..837cc68 100644
--- a/components/translate/core/browser/options_menu_model.cc
+++ b/components/translate/core/browser/options_menu_model.cc
@@ -10,6 +10,8 @@
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace translate {
+
 namespace {
 
 const char kAboutGoogleTranslateURL[] =
@@ -135,3 +137,5 @@ void OptionsMenuModel::ExecuteCommand(int command_id, int event_flags) {
       break;
   }
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/options_menu_model.h b/components/translate/core/browser/options_menu_model.h
index 7cb65b8..d5da23e 100644
--- a/components/translate/core/browser/options_menu_model.h
+++ b/components/translate/core/browser/options_menu_model.h
@@ -7,6 +7,8 @@
 
 #include "ui/base/models/simple_menu_model.h"
 
+namespace translate {
+
 class TranslateInfoBarDelegate;
 
 // A menu model that builds the contents of the options menu in the translate
@@ -40,4 +42,6 @@ class OptionsMenuModel : public ui::SimpleMenuModel,
   DISALLOW_COPY_AND_ASSIGN(OptionsMenuModel);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_OPTIONS_MENU_MODEL_H_
diff --git a/components/translate/core/browser/page_translated_details.h b/components/translate/core/browser/page_translated_details.h
index 7238c52..acc484e 100644
--- a/components/translate/core/browser/page_translated_details.h
+++ b/components/translate/core/browser/page_translated_details.h
@@ -9,6 +9,8 @@
 
 #include "components/translate/core/common/translate_errors.h"
 
+namespace translate {
+
 // Used when sending a notification about a page that has been translated.
 struct PageTranslatedDetails {
   std::string source_language;
@@ -16,4 +18,6 @@ struct PageTranslatedDetails {
   TranslateErrors::Type error_type;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_PAGE_TRANSLATED_DETAILS_H_
diff --git a/components/translate/core/browser/translate_accept_languages.cc b/components/translate/core/browser/translate_accept_languages.cc
index 773530c..0a56713 100644
--- a/components/translate/core/browser/translate_accept_languages.cc
+++ b/components/translate/core/browser/translate_accept_languages.cc
@@ -12,6 +12,8 @@
 #include "components/translate/core/common/translate_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace translate {
+
 TranslateAcceptLanguages::TranslateAcceptLanguages(
     PrefService* prefs,
     const char* accept_languages_pref)
@@ -79,3 +81,4 @@ void TranslateAcceptLanguages::InitAcceptLanguages(PrefService* prefs) {
   }
 }
 
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_accept_languages.h b/components/translate/core/browser/translate_accept_languages.h
index 1c2a328..9aadbc3 100644
--- a/components/translate/core/browser/translate_accept_languages.h
+++ b/components/translate/core/browser/translate_accept_languages.h
@@ -13,6 +13,8 @@
 
 class PrefService;
 
+namespace translate {
+
 // TranslateAcceptLanguages tracks the value of the "Accept-Language" HTTP
 // header.
 class TranslateAcceptLanguages {
@@ -50,4 +52,6 @@ class TranslateAcceptLanguages {
   DISALLOW_COPY_AND_ASSIGN(TranslateAcceptLanguages);
 };
 
+}  // namespace translate
+
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_ACCEPT_LANGUAGES_H_
diff --git a/components/translate/core/browser/translate_browser_metrics.cc b/components/translate/core/browser/translate_browser_metrics.cc
index c0d3357d..7b4de23 100644
--- a/components/translate/core/browser/translate_browser_metrics.cc
+++ b/components/translate/core/browser/translate_browser_metrics.cc
@@ -11,6 +11,8 @@
 #include "base/metrics/sparse_histogram.h"
 #include "components/language_usage_metrics/language_usage_metrics.h"
 
+namespace translate {
+
 namespace {
 
 // Constant string values to indicate UMA names. All entries should have
@@ -92,3 +94,5 @@ const char* GetMetricsName(MetricsNameIndex index) {
 }
 
 }  // namespace TranslateBrowserMetrics
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_browser_metrics.h b/components/translate/core/browser/translate_browser_metrics.h
index 0d76e7b..2974104 100644
--- a/components/translate/core/browser/translate_browser_metrics.h
+++ b/components/translate/core/browser/translate_browser_metrics.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+namespace translate {
+
 namespace TranslateBrowserMetrics {
 
 // An indexing type to query each UMA entry name via GetMetricsName() function.
@@ -61,4 +63,6 @@ const char* GetMetricsName(MetricsNameIndex index);
 
 }  // namespace TranslateBrowserMetrics
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_BROWSER_METRICS_H_
diff --git a/components/translate/core/browser/translate_browser_metrics_unittest.cc b/components/translate/core/browser/translate_browser_metrics_unittest.cc
index 404014f..17c53c3 100644
--- a/components/translate/core/browser/translate_browser_metrics_unittest.cc
+++ b/components/translate/core/browser/translate_browser_metrics_unittest.cc
@@ -41,28 +41,44 @@ class MetricsRecorder {
                              int expected_show_infobar) {
     Snapshot();
 
-    EXPECT_EQ(expected_disabled_by_prefs, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_PREFS));
-    EXPECT_EQ(expected_disabled_by_switch, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_SWITCH));
-    EXPECT_EQ(expected_disabled_by_config, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG));
-    EXPECT_EQ(expected_language_is_not_supported, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED));
-    EXPECT_EQ(expected_mime_type_is_not_supported, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_MIME_TYPE_IS_NOT_SUPPORTED));
-    EXPECT_EQ(expected_url_is_not_supported, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED));
-    EXPECT_EQ(expected_similar_languages, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES));
-    EXPECT_EQ(expected_accept_languages, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES));
-    EXPECT_EQ(expected_auto_by_config, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_CONFIG));
-    EXPECT_EQ(expected_auto_by_link, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_LINK));
-    EXPECT_EQ(expected_show_infobar, GetCountWithoutSnapshot(
-        TranslateBrowserMetrics::INITIATION_STATUS_SHOW_INFOBAR));
+    EXPECT_EQ(expected_disabled_by_prefs,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_DISABLED_BY_PREFS));
+    EXPECT_EQ(
+        expected_disabled_by_switch,
+        GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                    INITIATION_STATUS_DISABLED_BY_SWITCH));
+    EXPECT_EQ(
+        expected_disabled_by_config,
+        GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                    INITIATION_STATUS_DISABLED_BY_CONFIG));
+    EXPECT_EQ(expected_language_is_not_supported,
+              GetCountWithoutSnapshot(
+                  translate::TranslateBrowserMetrics::
+                      INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED));
+    EXPECT_EQ(expected_mime_type_is_not_supported,
+              GetCountWithoutSnapshot(
+                  translate::TranslateBrowserMetrics::
+                      INITIATION_STATUS_MIME_TYPE_IS_NOT_SUPPORTED));
+    EXPECT_EQ(
+        expected_url_is_not_supported,
+        GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                    INITIATION_STATUS_URL_IS_NOT_SUPPORTED));
+    EXPECT_EQ(expected_similar_languages,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_SIMILAR_LANGUAGES));
+    EXPECT_EQ(expected_accept_languages,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_ACCEPT_LANGUAGES));
+    EXPECT_EQ(expected_auto_by_config,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_AUTO_BY_CONFIG));
+    EXPECT_EQ(expected_auto_by_link,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_AUTO_BY_LINK));
+    EXPECT_EQ(expected_show_infobar,
+              GetCountWithoutSnapshot(translate::TranslateBrowserMetrics::
+                                          INITIATION_STATUS_SHOW_INFOBAR));
   }
 
   HistogramBase::Count GetTotalCount() {
@@ -107,50 +123,53 @@ class MetricsRecorder {
 }  // namespace
 
 TEST(TranslateBrowserMetricsTest, ReportInitiationStatus) {
-  MetricsRecorder recorder(TranslateBrowserMetrics::GetMetricsName(
-      TranslateBrowserMetrics::UMA_INITIATION_STATUS));
+  MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
+      translate::TranslateBrowserMetrics::UMA_INITIATION_STATUS));
 
   recorder.CheckInitiationStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_PREFS);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_PREFS);
   recorder.CheckInitiationStatus(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_SWITCH);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_SWITCH);
   recorder.CheckInitiationStatus(1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
   recorder.CheckInitiationStatus(1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::
+          INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_MIME_TYPE_IS_NOT_SUPPORTED);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::
+          INITIATION_STATUS_MIME_TYPE_IS_NOT_SUPPORTED);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_URL_IS_NOT_SUPPORTED);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::
+          INITIATION_STATUS_URL_IS_NOT_SUPPORTED);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_SIMILAR_LANGUAGES);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_CONFIG);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_CONFIG);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_LINK);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_AUTO_BY_LINK);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0);
-  TranslateBrowserMetrics::ReportInitiationStatus(
-      TranslateBrowserMetrics::INITIATION_STATUS_SHOW_INFOBAR);
+  translate::TranslateBrowserMetrics::ReportInitiationStatus(
+      translate::TranslateBrowserMetrics::INITIATION_STATUS_SHOW_INFOBAR);
   recorder.CheckInitiationStatus(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
 }
 
 TEST(TranslateBrowserMetricsTest, ReportLanguageDetectionError) {
-  MetricsRecorder recorder(TranslateBrowserMetrics::GetMetricsName(
-      TranslateBrowserMetrics::UMA_LANGUAGE_DETECTION_ERROR));
+  MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
+      translate::TranslateBrowserMetrics::UMA_LANGUAGE_DETECTION_ERROR));
   EXPECT_EQ(0, recorder.GetTotalCount());
-  TranslateBrowserMetrics::ReportLanguageDetectionError();
+  translate::TranslateBrowserMetrics::ReportLanguageDetectionError();
   EXPECT_EQ(1, recorder.GetTotalCount());
 
 }
@@ -159,29 +178,31 @@ TEST(TranslateBrowserMetricsTest, ReportLanguageDetectionError) {
 TEST(TranslateBrowserMetricsTest, ReportedLocalesOnDisabledByPrefs) {
   const int ENGLISH = 25966;
 
-  MetricsRecorder recorder(TranslateBrowserMetrics::GetMetricsName(
-      TranslateBrowserMetrics::UMA_LOCALES_ON_DISABLED_BY_PREFS));
+  MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
+      translate::TranslateBrowserMetrics::UMA_LOCALES_ON_DISABLED_BY_PREFS));
   EXPECT_EQ(0, recorder.GetTotalCount());
-  TranslateBrowserMetrics::ReportLocalesOnDisabledByPrefs("en");
+  translate::TranslateBrowserMetrics::ReportLocalesOnDisabledByPrefs("en");
   EXPECT_EQ(1, recorder.GetCount(ENGLISH));
 }
 
 TEST(TranslateBrowserMetricsTest, ReportedUndisplayableLanguage) {
   const int ENGLISH = 25966;
 
-  MetricsRecorder recorder(TranslateBrowserMetrics::GetMetricsName(
-      TranslateBrowserMetrics::UMA_UNDISPLAYABLE_LANGUAGE));
+  MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
+      translate::TranslateBrowserMetrics::UMA_UNDISPLAYABLE_LANGUAGE));
   EXPECT_EQ(0, recorder.GetTotalCount());
-  TranslateBrowserMetrics::ReportUndisplayableLanguage("en");
+  translate::TranslateBrowserMetrics::ReportUndisplayableLanguage("en");
   EXPECT_EQ(1, recorder.GetCount(ENGLISH));
 }
 
 TEST(TranslateBrowserMetricsTest, ReportedUnsupportedLanguageAtInitiation) {
   const int ENGLISH = 25966;
 
-  MetricsRecorder recorder(TranslateBrowserMetrics::GetMetricsName(
-      TranslateBrowserMetrics::UMA_UNSUPPORTED_LANGUAGE_AT_INITIATION));
+  MetricsRecorder recorder(translate::TranslateBrowserMetrics::GetMetricsName(
+      translate::TranslateBrowserMetrics::
+          UMA_UNSUPPORTED_LANGUAGE_AT_INITIATION));
   EXPECT_EQ(0, recorder.GetTotalCount());
-  TranslateBrowserMetrics::ReportUnsupportedLanguageAtInitiation("en");
+  translate::TranslateBrowserMetrics::ReportUnsupportedLanguageAtInitiation(
+      "en");
   EXPECT_EQ(1, recorder.GetCount(ENGLISH));
 }
diff --git a/components/translate/core/browser/translate_client.h b/components/translate/core/browser/translate_client.h
index 38fcdea..306f4cc 100644
--- a/components/translate/core/browser/translate_client.h
+++ b/components/translate/core/browser/translate_client.h
@@ -15,14 +15,17 @@
 
 class GURL;
 class PrefService;
-class TranslateAcceptLanguages;
-class TranslateDriver;
-class TranslateInfoBarDelegate;
 
 namespace infobars {
 class InfoBar;
 }
 
+namespace translate {
+
+class TranslateAcceptLanguages;
+class TranslateDriver;
+class TranslateInfoBarDelegate;
+
 // A client interface that needs to be supplied to TranslateManager by the
 // embedder.
 //
@@ -66,4 +69,6 @@ class TranslateClient {
   virtual void ShowReportLanguageDetectionErrorUI(const GURL& report_url) = 0;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_CLIENT_H_
diff --git a/components/translate/core/browser/translate_download_manager.cc b/components/translate/core/browser/translate_download_manager.cc
index 6b33ec03..9daf2d5 100644
--- a/components/translate/core/browser/translate_download_manager.cc
+++ b/components/translate/core/browser/translate_download_manager.cc
@@ -11,6 +11,8 @@
 #include "components/translate/core/common/translate_pref_names.h"
 #include "components/translate/core/common/translate_switches.h"
 
+namespace translate {
+
 // static
 TranslateDownloadManager* TranslateDownloadManager::GetInstance() {
   return Singleton<TranslateDownloadManager>::get();
@@ -130,3 +132,5 @@ void TranslateDownloadManager::SetTranslateScriptExpirationDelay(int delay_ms) {
   }
   script_->set_expiration_delay(delay_ms);
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_download_manager.h b/components/translate/core/browser/translate_download_manager.h
index ed8e04b..728a58e 100644
--- a/components/translate/core/browser/translate_download_manager.h
+++ b/components/translate/core/browser/translate_download_manager.h
@@ -17,6 +17,8 @@ template <typename T> struct DefaultSingletonTraits;
 
 class PrefService;
 
+namespace translate {
+
 // Manages the downloaded resources for Translate, such as the translate script
 // and the language list.
 class TranslateDownloadManager {
@@ -101,4 +103,6 @@ class TranslateDownloadManager {
   scoped_refptr<net::URLRequestContextGetter> request_context_;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_DOWNLOAD_MANAGER_H_
diff --git a/components/translate/core/browser/translate_driver.h b/components/translate/core/browser/translate_driver.h
index c56498b..0cfc62d 100644
--- a/components/translate/core/browser/translate_driver.h
+++ b/components/translate/core/browser/translate_driver.h
@@ -9,6 +9,8 @@
 
 class GURL;
 
+namespace translate {
+
 // Interface that allows Translate core code to interact with its driver (i.e.,
 // obtain information from it and give information to it). A concrete
 // implementation must be provided by the driver.
@@ -55,4 +57,6 @@ class TranslateDriver {
   virtual void OpenUrlInNewTab(const GURL& url) = 0;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_DRIVER_H_
diff --git a/components/translate/core/browser/translate_error_details.h b/components/translate/core/browser/translate_error_details.h
index 0207d9c..cd7b696 100644
--- a/components/translate/core/browser/translate_error_details.h
+++ b/components/translate/core/browser/translate_error_details.h
@@ -9,6 +9,8 @@
 #include "components/translate/core/common/translate_errors.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 struct TranslateErrorDetails {
   // The time when this was created
   base::Time time;
@@ -20,4 +22,6 @@ struct TranslateErrorDetails {
   TranslateErrors::Type error;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_ERROR_DETAILS_H_
diff --git a/components/translate/core/browser/translate_event_details.cc b/components/translate/core/browser/translate_event_details.cc
index c8a2cb0..e88b406 100644
--- a/components/translate/core/browser/translate_event_details.cc
+++ b/components/translate/core/browser/translate_event_details.cc
@@ -4,6 +4,8 @@
 
 #include "components/translate/core/browser/translate_event_details.h"
 
+namespace translate {
+
 TranslateEventDetails::TranslateEventDetails(const std::string& in_filename,
                                              int in_line,
                                              const std::string& in_message)
@@ -12,3 +14,5 @@ TranslateEventDetails::TranslateEventDetails(const std::string& in_filename,
       message(in_message) {
   time = base::Time::Now();
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_event_details.h b/components/translate/core/browser/translate_event_details.h
index 740fd6b..cc2d83a 100644
--- a/components/translate/core/browser/translate_event_details.h
+++ b/components/translate/core/browser/translate_event_details.h
@@ -9,6 +9,8 @@
 
 #include "base/time/time.h"
 
+namespace translate {
+
 struct TranslateEventDetails {
   TranslateEventDetails(const std::string& in_filename,
                         int in_line,
@@ -27,4 +29,6 @@ struct TranslateEventDetails {
   std::string message;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_EVENT_DETAILS_H_
diff --git a/components/translate/core/browser/translate_infobar_delegate.cc b/components/translate/core/browser/translate_infobar_delegate.cc
index 7c18f6b..234f773 100644
--- a/components/translate/core/browser/translate_infobar_delegate.cc
+++ b/components/translate/core/browser/translate_infobar_delegate.cc
@@ -20,6 +20,8 @@
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace translate {
+
 namespace {
 
 // Counts used to decide whether infobars should be shown.
@@ -366,3 +368,5 @@ TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_infobar_delegate.h b/components/translate/core/browser/translate_infobar_delegate.h
index cf53825..ab1bcc9 100644
--- a/components/translate/core/browser/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -19,14 +19,16 @@
 #include "components/translate/core/common/translate_constants.h"
 #include "components/translate/core/common/translate_errors.h"
 
-class TranslateClient;
-class TranslateDriver;
-class TranslateManager;
-
 namespace infobars {
 class InfoBarManager;
 }
 
+namespace translate {
+
+class TranslateClient;
+class TranslateDriver;
+class TranslateManager;
+
 class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
  public:
   // The types of background color animations.
@@ -218,4 +220,6 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_
diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc
index d41af2e..f4b5aa9 100644
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -23,6 +23,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 namespace {
 
 // The default list of languages the Google translation server supports.
@@ -185,8 +187,8 @@ void TranslateLanguageList::RequestLanguageList() {
       (language_list_fetcher_->state() == TranslateURLFetcher::IDLE ||
        language_list_fetcher_->state() == TranslateURLFetcher::FAILED)) {
     GURL url = TranslateLanguageUrl();
-    url = TranslateURLUtil::AddHostLocaleToUrl(url);
-    url = TranslateURLUtil::AddApiKeyToUrl(url);
+    url = AddHostLocaleToUrl(url);
+    url = AddApiKeyToUrl(url);
     url = net::AppendQueryParameter(
         url, kAlphaLanguageQueryName, kAlphaLanguageQueryValue);
 
@@ -337,3 +339,5 @@ void TranslateLanguageList::SetSupportedLanguages(
     alpha_languages_.insert(lang);
   }
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_language_list.h b/components/translate/core/browser/translate_language_list.h
index de8ce17..c68757d 100644
--- a/components/translate/core/browser/translate_language_list.h
+++ b/components/translate/core/browser/translate_language_list.h
@@ -13,8 +13,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 
-struct TranslateEventDetails;
 class GURL;
+
+namespace translate {
+
+struct TranslateEventDetails;
 class TranslateURLFetcher;
 
 // The TranslateLanguageList class is responsible for maintaining the latest
@@ -113,4 +116,6 @@ class TranslateLanguageList {
   DISALLOW_COPY_AND_ASSIGN(TranslateLanguageList);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_LANGUAGE_LIST_H_
diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
index 31b3fc5..6fa1aa4 100644
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -31,6 +31,8 @@
 #include "net/base/url_util.h"
 #include "net/http/http_status_code.h"
 
+namespace translate {
+
 namespace {
 
 // Callbacks for translate errors.
@@ -272,8 +274,8 @@ void TranslateManager::ReportLanguageDetectionError() {
                                 kSourceLanguageQueryName,
                                 language_state_.original_language());
 
-  report_error_url = TranslateURLUtil::AddHostLocaleToUrl(report_error_url);
-  report_error_url = TranslateURLUtil::AddApiKeyToUrl(report_error_url);
+  report_error_url = translate::AddHostLocaleToUrl(report_error_url);
+  report_error_url = translate::AddApiKeyToUrl(report_error_url);
 
   translate_client_->ShowReportLanguageDetectionErrorUI(report_error_url);
 }
@@ -387,3 +389,5 @@ std::string TranslateManager::GetAutoTargetLanguage(
 LanguageState& TranslateManager::GetLanguageState() {
   return language_state_;
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_manager.h b/components/translate/core/browser/translate_manager.h
index ed1889e..74abcca 100644
--- a/components/translate/core/browser/translate_manager.h
+++ b/components/translate/core/browser/translate_manager.h
@@ -18,6 +18,9 @@
 
 class GURL;
 class PrefService;
+
+namespace translate {
+
 class TranslateClient;
 class TranslateDriver;
 class TranslatePrefs;
@@ -125,4 +128,6 @@ class TranslateManager {
   DISALLOW_COPY_AND_ASSIGN(TranslateManager);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_MANAGER_H_
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index aea183a..4f9c2a7 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -15,6 +15,8 @@
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/common/translate_util.h"
 
+namespace translate {
+
 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] =
     "translate_language_blacklist";
 const char TranslatePrefs::kPrefTranslateSiteBlacklist[] =
@@ -572,3 +574,5 @@ bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
   const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_prefs.h b/components/translate/core/browser/translate_prefs.h
index cb6971d..c1b89c5 100644
--- a/components/translate/core/browser/translate_prefs.h
+++ b/components/translate/core/browser/translate_prefs.h
@@ -13,7 +13,6 @@
 
 class PrefService;
 class Profile;
-class TranslateAcceptLanguages;
 
 namespace base {
 class DictionaryValue;
@@ -24,6 +23,10 @@ namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
+namespace translate {
+
+class TranslateAcceptLanguages;
+
 // The wrapper of PrefService object for Translate.
 //
 // It is assumed that |prefs_| is alive while this instance is alive.
@@ -162,4 +165,6 @@ class TranslatePrefs {
   DISALLOW_COPY_AND_ASSIGN(TranslatePrefs);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_PREFS_H_
diff --git a/components/translate/core/browser/translate_prefs_unittest.cc b/components/translate/core/browser/translate_prefs_unittest.cc
index b9cb315..1b70d14 100644
--- a/components/translate/core/browser/translate_prefs_unittest.cc
+++ b/components/translate/core/browser/translate_prefs_unittest.cc
@@ -11,6 +11,8 @@
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace translate {
+
 TEST(TranslatePrefsTest, CreateBlockedLanguages) {
   TranslateDownloadManager::GetInstance()->set_application_locale("en");
   std::vector<std::string> blacklisted_languages;
@@ -118,3 +120,5 @@ TEST(TranslatePrefsTest, CreateBlockedLanguagesNonEnglishUI) {
     }
   }
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
index 68b5cff..3edff69 100644
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -21,6 +21,8 @@
 #include "net/base/url_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace translate {
+
 namespace {
 
 const int kExpirationDelayDays = 1;
@@ -101,10 +103,8 @@ void TranslateScript::Request(const RequestCallback& callback) {
       kJavascriptLoaderCallbackQueryValue);
 #endif  // !defined(OS_IOS)
 
-  translate_script_url =
-      TranslateURLUtil::AddHostLocaleToUrl(translate_script_url);
-  translate_script_url =
-      TranslateURLUtil::AddApiKeyToUrl(translate_script_url);
+  translate_script_url = AddHostLocaleToUrl(translate_script_url);
+  translate_script_url = AddApiKeyToUrl(translate_script_url);
 
   fetcher_.reset(new TranslateURLFetcher(kFetcherId));
   fetcher_->set_extra_request_header(kRequestHeader);
@@ -154,3 +154,5 @@ void TranslateScript::OnScriptFetchComplete(
   }
   callback_list_.clear();
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_script.h b/components/translate/core/browser/translate_script.h
index 156d3a5..065ccc7 100644
--- a/components/translate/core/browser/translate_script.h
+++ b/components/translate/core/browser/translate_script.h
@@ -14,6 +14,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 
+namespace translate {
+
 class TranslateScriptTest;
 class TranslateURLFetcher;
 
@@ -90,4 +92,6 @@ class TranslateScript {
   DISALLOW_COPY_AND_ASSIGN(TranslateScript);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_SCRIPT_H_
diff --git a/components/translate/core/browser/translate_script_unittest.cc b/components/translate/core/browser/translate_script_unittest.cc
index c8e3316..8fb99b6 100644
--- a/components/translate/core/browser/translate_script_unittest.cc
+++ b/components/translate/core/browser/translate_script_unittest.cc
@@ -16,6 +16,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 class TranslateScriptTest : public testing::Test {
  public:
   TranslateScriptTest() : testing::Test() {}
@@ -118,3 +120,5 @@ TEST_F(TranslateScriptTest, CheckScriptURL) {
   EXPECT_EQ(expected_url.GetOrigin().spec(), url.GetOrigin().spec());
   EXPECT_EQ(expected_url.path(), url.path());
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_ui_delegate.cc b/components/translate/core/browser/translate_ui_delegate.cc
index 3cbcff3..a51ef83 100644
--- a/components/translate/core/browser/translate_ui_delegate.cc
+++ b/components/translate/core/browser/translate_ui_delegate.cc
@@ -31,6 +31,8 @@ const char kShowErrorUI[] = "Translate.ShowErrorUI";
 
 }  // namespace
 
+namespace translate {
+
 TranslateUIDelegate::TranslateUIDelegate(
     const base::WeakPtr<TranslateManager>& translate_manager,
     const std::string& original_language,
@@ -257,3 +259,5 @@ std::string TranslateUIDelegate::GetPageHost() {
     return std::string();
   return translate_driver_->GetActiveURL().HostNoBrackets();
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_ui_delegate.h b/components/translate/core/browser/translate_ui_delegate.h
index aaf6303..cf8a9a2 100644
--- a/components/translate/core/browser/translate_ui_delegate.h
+++ b/components/translate/core/browser/translate_ui_delegate.h
@@ -14,6 +14,8 @@
 #include "base/strings/string16.h"
 #include "components/translate/core/common/translate_errors.h"
 
+namespace translate {
+
 class LanguageState;
 class TranslateClient;
 class TranslateDriver;
@@ -128,4 +130,6 @@ class TranslateUIDelegate {
   DISALLOW_COPY_AND_ASSIGN(TranslateUIDelegate);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_UI_DELEGATE_H_
diff --git a/components/translate/core/browser/translate_url_fetcher.cc b/components/translate/core/browser/translate_url_fetcher.cc
index 85988a9..09704fd 100644
--- a/components/translate/core/browser/translate_url_fetcher.cc
+++ b/components/translate/core/browser/translate_url_fetcher.cc
@@ -10,6 +10,8 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
+namespace translate {
+
 namespace {
 
 // Retry parameter for fetching.
@@ -80,3 +82,5 @@ void TranslateURLFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
   scoped_ptr<const net::URLFetcher> delete_ptr(fetcher_.release());
   callback_.Run(id_, state_ == COMPLETED, data);
 }
+
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_url_fetcher.h b/components/translate/core/browser/translate_url_fetcher.h
index 9643613..210983f 100644
--- a/components/translate/core/browser/translate_url_fetcher.h
+++ b/components/translate/core/browser/translate_url_fetcher.h
@@ -10,6 +10,8 @@
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 // Downloads raw Translate data such as the Translate script and the language
 // list.
 class TranslateURLFetcher : public net::URLFetcherDelegate {
@@ -83,4 +85,6 @@ class TranslateURLFetcher : public net::URLFetcherDelegate {
   DISALLOW_COPY_AND_ASSIGN(TranslateURLFetcher);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_URL_FETCHER_H_
diff --git a/components/translate/core/browser/translate_url_util.cc b/components/translate/core/browser/translate_url_util.cc
index 497cdae8..fc4105c 100644
--- a/components/translate/core/browser/translate_url_util.cc
+++ b/components/translate/core/browser/translate_url_util.cc
@@ -8,6 +8,8 @@
 #include "google_apis/google_api_keys.h"
 #include "net/base/url_util.h"
 
+namespace translate {
+
 namespace {
 
 // Used in all translate URLs to specify API Key.
@@ -19,8 +21,6 @@ const char kHostLocaleQueryName[] = "hl";
 
 }  // namespace
 
-namespace TranslateURLUtil {
-
 GURL AddApiKeyToUrl(const GURL& url) {
   return net::AppendQueryParameter(url, kApiKeyName, google_apis::GetAPIKey());
 }
@@ -33,4 +33,4 @@ GURL AddHostLocaleToUrl(const GURL& url) {
           TranslateDownloadManager::GetInstance()->application_locale()));
 }
 
-}  // namespace TranslateURLUtil
+}  // namespace translate
diff --git a/components/translate/core/browser/translate_url_util.h b/components/translate/core/browser/translate_url_util.h
index 9bae89d..28a0367 100644
--- a/components/translate/core/browser/translate_url_util.h
+++ b/components/translate/core/browser/translate_url_util.h
@@ -7,7 +7,7 @@
 
 #include "url/gurl.h"
 
-namespace TranslateURLUtil {
+namespace translate {
 
 // Appends Translate API Key as a part of query to a passed |url|, and returns
 // GURL instance.
@@ -17,6 +17,6 @@ GURL AddApiKeyToUrl(const GURL& url);
 // returns GURL instance.
 GURL AddHostLocaleToUrl(const GURL& url);
 
-}  // namespace TranslateURLUtil
+}  // namespace translate
 
 #endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_URL_UTIL_H_
diff --git a/components/translate/core/common/language_detection_details.cc b/components/translate/core/common/language_detection_details.cc
index b344d06..d75f049 100644
--- a/components/translate/core/common/language_detection_details.cc
+++ b/components/translate/core/common/language_detection_details.cc
@@ -4,6 +4,10 @@
 
 #include "components/translate/core/common/language_detection_details.h"
 
+namespace translate {
+
 LanguageDetectionDetails::LanguageDetectionDetails() {}
 
 LanguageDetectionDetails::~LanguageDetectionDetails() {}
+
+}  // namespace translate
diff --git a/components/translate/core/common/language_detection_details.h b/components/translate/core/common/language_detection_details.h
index 6cc1a66..d18c23b 100644
--- a/components/translate/core/common/language_detection_details.h
+++ b/components/translate/core/common/language_detection_details.h
@@ -11,6 +11,8 @@
 #include "base/time/time.h"
 #include "url/gurl.h"
 
+namespace translate {
+
 struct LanguageDetectionDetails {
   LanguageDetectionDetails();
   ~LanguageDetectionDetails();
@@ -40,4 +42,6 @@ struct LanguageDetectionDetails {
   base::string16 contents;
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_COMMON_LANGUAGE_DETECTION_DETAILS_H_
diff --git a/components/translate/core/common/translate_errors.h b/components/translate/core/common/translate_errors.h
index d0651ad..7062fe3 100644
--- a/components/translate/core/common/translate_errors.h
+++ b/components/translate/core/common/translate_errors.h
@@ -7,6 +7,8 @@
 
 #include "base/basictypes.h"
 
+namespace translate {
+
 // This file consolidates all the error types for translation of a page.
 // Note: TranslateErrors is used for UMA and translate_internals.js.
 // Assigned numbers should be changed because the number is binded to UMA value.
@@ -38,4 +40,6 @@ class TranslateErrors {
   DISALLOW_COPY_AND_ASSIGN(TranslateErrors);
 };
 
+}  // namespace translate
+
 #endif  // COMPONENTS_TRANSLATE_CORE_COMMON_TRANSLATE_ERRORS_H_
diff --git a/components/translate/core/common/translate_metrics_unittest.cc b/components/translate/core/common/translate_metrics_unittest.cc
index ff7b974..04eac9f 100644
--- a/components/translate/core/common/translate_metrics_unittest.cc
+++ b/components/translate/core/common/translate_metrics_unittest.cc
@@ -18,6 +18,8 @@ using base::SampleCountIterator;
 using base::StatisticsRecorder;
 using base::TimeTicks;
 
+namespace translate {
+
 namespace {
 
 const int kTrue = 1;
@@ -282,3 +284,5 @@ TEST(TranslateMetricsTest, ReportLanguageDetectionTime) {
   recorder.CheckValueInLogs(9.009);
   recorder.CheckTotalCount(1);
 }
+
+}  // namespace translate