Rename TranslateTabHelper to ChromeTranslateClient

This class is the //chrome impl of TranslateClient.
Rename the class as per convention.

BUG=361115
R=blundell
TEST=browser_tests,components_unittests --gtest_filter=Translate*

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

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

36 files changed, 234 insertions, 220 deletions

diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 1842bf2..1e0092b 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index e9e6b82..9f437f2 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -1567,14 +1567,19 @@ bool TabsDetectLanguageFunction::RunAsync() {
 
   AddRef();  // Balanced in GotLanguage().
 
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(contents);
-  if (!translate_tab_helper->GetLanguageState().original_language().empty()) {
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(contents);
+  if (!chrome_translate_client->GetLanguageState()
+           .original_language()
+           .empty()) {
     // Delay the callback invocation until after the current JS call has
     // returned.
-    base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
-        &TabsDetectLanguageFunction::GotLanguage, this,
-        translate_tab_helper->GetLanguageState().original_language()));
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &TabsDetectLanguageFunction::GotLanguage,
+            this,
+            chrome_translate_client->GetLanguageState().original_language()));
     return true;
   }
   // The tab contents does not know its language yet.  Let's wait until it
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index c3ccb92..77c50f1 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -56,9 +56,9 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_browser_test_utils.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -1898,10 +1898,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_TranslateEnabled) {
   language_observer1.Wait();
 
   // Verify the translation detected for this tab.
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(contents);
-  ASSERT_TRUE(translate_tab_helper);
-  LanguageState& language_state = translate_tab_helper->GetLanguageState();
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(contents);
+  ASSERT_TRUE(chrome_translate_client);
+  LanguageState& language_state = chrome_translate_client->GetLanguageState();
   EXPECT_EQ("fr", language_state.original_language());
   EXPECT_TRUE(language_state.page_needs_translation());
   EXPECT_FALSE(language_state.translation_pending());
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 88159fd..31fe045 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -51,8 +51,8 @@
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -1173,12 +1173,12 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
       return true;
 
     case IDC_CONTENT_CONTEXT_TRANSLATE: {
-      TranslateTabHelper* translate_tab_helper =
-          TranslateTabHelper::FromWebContents(source_web_contents_);
-      if (!translate_tab_helper)
+      ChromeTranslateClient* chrome_translate_client =
+          ChromeTranslateClient::FromWebContents(source_web_contents_);
+      if (!chrome_translate_client)
         return false;
       std::string original_lang =
-          translate_tab_helper->GetLanguageState().original_language();
+          chrome_translate_client->GetLanguageState().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
       target_lang = TranslateDownloadManager::GetLanguageCode(target_lang);
       // Note that we intentionally enable the menu even if the original and
@@ -1187,7 +1187,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
       // language.
       return ((params_.edit_flags & WebContextMenuData::CanTranslate) != 0) &&
              !original_lang.empty() &&  // Did we receive the page language yet?
-             !translate_tab_helper->GetLanguageState().IsPageTranslated() &&
+             !chrome_translate_client->GetLanguageState().IsPageTranslated() &&
              !source_web_contents_->GetInterstitialPage() &&
              // There are some application locales which can't be used as a
              // target language for translation.
@@ -1723,24 +1723,25 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
     case IDC_CONTENT_CONTEXT_TRANSLATE: {
       // A translation might have been triggered by the time the menu got
       // selected, do nothing in that case.
-      TranslateTabHelper* translate_tab_helper =
-          TranslateTabHelper::FromWebContents(source_web_contents_);
-      if (!translate_tab_helper ||
-          translate_tab_helper->GetLanguageState().IsPageTranslated() ||
-          translate_tab_helper->GetLanguageState().translation_pending()) {
+      ChromeTranslateClient* chrome_translate_client =
+          ChromeTranslateClient::FromWebContents(source_web_contents_);
+      if (!chrome_translate_client ||
+          chrome_translate_client->GetLanguageState().IsPageTranslated() ||
+          chrome_translate_client->GetLanguageState().translation_pending()) {
         return;
       }
       std::string original_lang =
-          translate_tab_helper->GetLanguageState().original_language();
+          chrome_translate_client->GetLanguageState().original_language();
       std::string target_lang = g_browser_process->GetApplicationLocale();
       target_lang = TranslateDownloadManager::GetLanguageCode(target_lang);
       // Since the user decided to translate for that language and site, clears
       // any preferences for not translating them.
       scoped_ptr<TranslatePrefs> prefs(
-          TranslateTabHelper::CreateTranslatePrefs(profile_->GetPrefs()));
+          ChromeTranslateClient::CreateTranslatePrefs(profile_->GetPrefs()));
       prefs->UnblockLanguage(original_lang);
       prefs->RemoveSiteFromBlacklist(params_.page_url.HostNoBrackets());
-      TranslateManager* manager = translate_tab_helper->GetTranslateManager();
+      TranslateManager* manager =
+          chrome_translate_client->GetTranslateManager();
       DCHECK(manager);
       manager->TranslatePage(original_lang, target_lang, true);
       break;
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index a16191c8..99b0528 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/common/pref_names.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/sync_driver/pref_names.h"
@@ -417,9 +417,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
   ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
 
   scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
   scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
   ASSERT_FALSE(translate_client0_prefs->IsBlockedLanguage("fr"));
   translate_client0_prefs->BlockLanguage("fr");
   ASSERT_TRUE(translate_client0_prefs->IsBlockedLanguage("fr"));
@@ -441,9 +441,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
   ASSERT_TRUE(BooleanPrefMatches(prefs::kEnableTranslate));
 
   scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
   scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
   ASSERT_FALSE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
   translate_client0_prefs->WhitelistLanguagePair("en", "bg");
   ASSERT_TRUE(translate_client0_prefs->IsLanguagePairWhitelisted("en", "bg"));
@@ -467,9 +467,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
   GURL url("http://www.google.com");
   std::string host(url.host());
   scoped_ptr<TranslatePrefs> translate_client0_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(0)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(0)));
   scoped_ptr<TranslatePrefs> translate_client1_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(GetPrefs(1)));
+      ChromeTranslateClient::CreateTranslatePrefs(GetPrefs(1)));
   ASSERT_FALSE(translate_client0_prefs->IsSiteBlacklisted(host));
   translate_client0_prefs->BlacklistSite(host);
   ASSERT_TRUE(translate_client0_prefs->IsSiteBlacklisted(host));
diff --git a/chrome/browser/translate/translate_tab_helper.cc b/chrome/browser/translate/chrome_translate_client.cc
index ac2190f..15fc4fe 100644
--- a/chrome/browser/translate/translate_tab_helper.cc
+++ b/chrome/browser/translate/chrome_translate_client.cc
@@ -1,8 +1,8 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 
 #include <vector>
 
@@ -59,33 +59,34 @@ const int kMaxTranslateLoadCheckAttempts = 20;
 
 }  // namespace
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(TranslateTabHelper);
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeTranslateClient);
 
 #if defined(CLD2_DYNAMIC_MODE)
 // Statics defined in the .h file:
-base::File* TranslateTabHelper::s_cached_file_ = NULL;
-uint64 TranslateTabHelper::s_cached_data_offset_ = 0;
-uint64 TranslateTabHelper::s_cached_data_length_ = 0;
-base::LazyInstance<base::Lock> TranslateTabHelper::s_file_lock_ =
+base::File* ChromeTranslateClient::s_cached_file_ = NULL;
+uint64 ChromeTranslateClient::s_cached_data_offset_ = 0;
+uint64 ChromeTranslateClient::s_cached_data_length_ = 0;
+base::LazyInstance<base::Lock> ChromeTranslateClient::s_file_lock_ =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
-TranslateTabHelper::TranslateTabHelper(content::WebContents* web_contents)
+ChromeTranslateClient::ChromeTranslateClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       max_reload_check_attempts_(kMaxTranslateLoadCheckAttempts),
       translate_driver_(&web_contents->GetController()),
       translate_manager_(new TranslateManager(this, prefs::kAcceptLanguages)),
-      weak_pointer_factory_(this) {}
+      weak_pointer_factory_(this) {
+}
 
-TranslateTabHelper::~TranslateTabHelper() {
+ChromeTranslateClient::~ChromeTranslateClient() {
 }
 
-LanguageState& TranslateTabHelper::GetLanguageState() {
+LanguageState& ChromeTranslateClient::GetLanguageState() {
   return translate_driver_.GetLanguageState();
 }
 
 // static
-scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
+scoped_ptr<TranslatePrefs> ChromeTranslateClient::CreateTranslatePrefs(
     PrefService* prefs) {
 #if defined(OS_CHROMEOS)
   const char* preferred_languages_prefs = prefs::kLanguagePreferredLanguages;
@@ -97,33 +98,35 @@ scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
 }
 
 // static
-TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages(
+TranslateAcceptLanguages* ChromeTranslateClient::GetTranslateAcceptLanguages(
     content::BrowserContext* browser_context) {
   return TranslateAcceptLanguagesFactory::GetForBrowserContext(browser_context);
 }
 
 // static
-TranslateManager* TranslateTabHelper::GetManagerFromWebContents(
+TranslateManager* ChromeTranslateClient::GetManagerFromWebContents(
     content::WebContents* web_contents) {
-  TranslateTabHelper* translate_tab_helper = FromWebContents(web_contents);
-  if (!translate_tab_helper)
+  ChromeTranslateClient* chrome_translate_client =
+      FromWebContents(web_contents);
+  if (!chrome_translate_client)
     return NULL;
-  return translate_tab_helper->GetTranslateManager();
+  return chrome_translate_client->GetTranslateManager();
 }
 
 // static
-void TranslateTabHelper::GetTranslateLanguages(
+void ChromeTranslateClient::GetTranslateLanguages(
     content::WebContents* web_contents,
     std::string* source,
     std::string* target) {
   DCHECK(source != NULL);
   DCHECK(target != NULL);
 
-  TranslateTabHelper* translate_tab_helper = FromWebContents(web_contents);
-  if (!translate_tab_helper)
+  ChromeTranslateClient* chrome_translate_client =
+      FromWebContents(web_contents);
+  if (!chrome_translate_client)
     return;
 
-  *source = translate_tab_helper->GetLanguageState().original_language();
+  *source = chrome_translate_client->GetLanguageState().original_language();
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -145,19 +148,19 @@ void TranslateTabHelper::GetTranslateLanguages(
   *target = TranslateManager::GetTargetLanguage(accept_languages_list);
 }
 
-TranslateManager* TranslateTabHelper::GetTranslateManager() {
+TranslateManager* ChromeTranslateClient::GetTranslateManager() {
   return translate_manager_.get();
 }
 
-content::WebContents* TranslateTabHelper::GetWebContents() {
+content::WebContents* ChromeTranslateClient::GetWebContents() {
   return web_contents();
 }
 
-void TranslateTabHelper::ShowTranslateUI(translate::TranslateStep step,
-                                         const std::string source_language,
-                                         const std::string target_language,
-                                         TranslateErrors::Type error_type,
-                                         bool triggered_from_menu) {
+void ChromeTranslateClient::ShowTranslateUI(translate::TranslateStep step,
+                                            const std::string source_language,
+                                            const std::string target_language,
+                                            TranslateErrors::Type error_type,
+                                            bool triggered_from_menu) {
   DCHECK(web_contents());
   if (error_type != TranslateErrors::NONE)
     step = translate::TRANSLATE_STEP_TRANSLATE_ERROR;
@@ -187,41 +190,41 @@ void TranslateTabHelper::ShowTranslateUI(translate::TranslateStep step,
       triggered_from_menu);
 }
 
-TranslateDriver* TranslateTabHelper::GetTranslateDriver() {
+TranslateDriver* ChromeTranslateClient::GetTranslateDriver() {
   return &translate_driver_;
 }
 
-PrefService* TranslateTabHelper::GetPrefs() {
+PrefService* ChromeTranslateClient::GetPrefs() {
   DCHECK(web_contents());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   return profile->GetOriginalProfile()->GetPrefs();
 }
 
-scoped_ptr<TranslatePrefs> TranslateTabHelper::GetTranslatePrefs() {
+scoped_ptr<TranslatePrefs> ChromeTranslateClient::GetTranslatePrefs() {
   DCHECK(web_contents());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   return CreateTranslatePrefs(profile->GetPrefs());
 }
 
-TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages() {
+TranslateAcceptLanguages* ChromeTranslateClient::GetTranslateAcceptLanguages() {
   DCHECK(web_contents());
   return GetTranslateAcceptLanguages(web_contents()->GetBrowserContext());
 }
 
-int TranslateTabHelper::GetInfobarIconID() const {
+int ChromeTranslateClient::GetInfobarIconID() const {
   return IDR_INFOBAR_TRANSLATE;
 }
 
-// TranslateTabHelper::CreateInfoBar() is implemented in platform-specific
+// ChromeTranslateClient::CreateInfoBar() is implemented in platform-specific
 // files.
 
-bool TranslateTabHelper::IsTranslatableURL(const GURL& url) {
+bool ChromeTranslateClient::IsTranslatableURL(const GURL& url) {
   return TranslateService::IsTranslatableURL(url);
 }
 
-void TranslateTabHelper::ShowReportLanguageDetectionErrorUI(
+void ChromeTranslateClient::ShowReportLanguageDetectionErrorUI(
     const GURL& report_url) {
 #if defined(OS_ANDROID)
   // Android does not support reporting language detection errors.
@@ -239,22 +242,22 @@ void TranslateTabHelper::ShowReportLanguageDetectionErrorUI(
 #endif  // defined(OS_ANDROID)
 }
 
-bool TranslateTabHelper::OnMessageReceived(const IPC::Message& message) {
+bool ChromeTranslateClient::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(TranslateTabHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_TranslateLanguageDetermined,
-                        OnLanguageDetermined)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageTranslated, OnPageTranslated)
+  IPC_BEGIN_MESSAGE_MAP(ChromeTranslateClient, message)
+  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_TranslateLanguageDetermined,
+                      OnLanguageDetermined)
+  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageTranslated, OnPageTranslated)
 #if defined(CLD2_DYNAMIC_MODE)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NeedCLDData, OnCLDDataRequested)
+  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NeedCLDData, OnCLDDataRequested)
 #endif
-    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
-void TranslateTabHelper::NavigationEntryCommitted(
+void ChromeTranslateClient::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   // Check whether this is a reload: When doing a page reload, the
   // TranslateLanguageDetermined IPC is not sent so the translation needs to be
@@ -297,20 +300,20 @@ void TranslateTabHelper::NavigationEntryCommitted(
   // an infobar, it must be done after that.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&TranslateTabHelper::InitiateTranslation,
+      base::Bind(&ChromeTranslateClient::InitiateTranslation,
                  weak_pointer_factory_.GetWeakPtr(),
                  translate_driver_.GetLanguageState().original_language(),
                  0));
 }
 
-void TranslateTabHelper::DidNavigateAnyFrame(
+void ChromeTranslateClient::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Let the LanguageState clear its state.
   translate_driver_.DidNavigate(details);
 }
 
-void TranslateTabHelper::WebContentsDestroyed() {
+void ChromeTranslateClient::WebContentsDestroyed() {
   // Translation process can be interrupted.
   // Destroying the TranslateManager now guarantees that it never has to deal
   // with NULL WebContents.
@@ -318,7 +321,7 @@ void TranslateTabHelper::WebContentsDestroyed() {
 }
 
 #if defined(CLD2_DYNAMIC_MODE)
-void TranslateTabHelper::OnCLDDataRequested() {
+void ChromeTranslateClient::OnCLDDataRequested() {
   // Quickly try to read s_cached_file_. If valid, the file handle is
   // cached and can be used immediately. Else, queue the caching task to the
   // blocking pool.
@@ -346,12 +349,12 @@ void TranslateTabHelper::OnCLDDataRequested() {
   // message if the caching attempt was successful.
   content::BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
-      base::Bind(&TranslateTabHelper::HandleCLDDataRequest),
-      base::Bind(&TranslateTabHelper::MaybeSendCLDDataAvailable,
+      base::Bind(&ChromeTranslateClient::HandleCLDDataRequest),
+      base::Bind(&ChromeTranslateClient::MaybeSendCLDDataAvailable,
                  weak_pointer_factory_.GetWeakPtr()));
 }
 
-void TranslateTabHelper::MaybeSendCLDDataAvailable() {
+void ChromeTranslateClient::MaybeSendCLDDataAvailable() {
   base::File* handle = NULL;
   uint64 data_offset = 0;
   uint64 data_length = 0;
@@ -366,15 +369,14 @@ void TranslateTabHelper::MaybeSendCLDDataAvailable() {
     SendCLDDataAvailable(handle, data_offset, data_length);
 }
 
-void TranslateTabHelper::SendCLDDataAvailable(const base::File* handle,
-                                              const uint64 data_offset,
-                                              const uint64 data_length) {
+void ChromeTranslateClient::SendCLDDataAvailable(const base::File* handle,
+                                                 const uint64 data_offset,
+                                                 const uint64 data_length) {
   // Data available, respond to the request.
-  IPC::PlatformFileForTransit ipc_platform_file =
-      IPC::GetFileHandleForProcess(
-          handle->GetPlatformFile(),
-          GetWebContents()->GetRenderViewHost()->GetProcess()->GetHandle(),
-          false);
+  IPC::PlatformFileForTransit ipc_platform_file = IPC::GetFileHandleForProcess(
+      handle->GetPlatformFile(),
+      GetWebContents()->GetRenderViewHost()->GetProcess()->GetHandle(),
+      false);
   // In general, sending a response from within the code path that is processing
   // a request is discouraged because there is potential for deadlock (if the
   // methods are sent synchronously) or loops (if the response can trigger a
@@ -383,10 +385,12 @@ void TranslateTabHelper::SendCLDDataAvailable(const base::File* handle,
   // safe.
   Send(new ChromeViewMsg_CLDDataAvailable(
       GetWebContents()->GetRenderViewHost()->GetRoutingID(),
-      ipc_platform_file, data_offset, data_length));
+      ipc_platform_file,
+      data_offset,
+      data_length));
 }
 
-void TranslateTabHelper::HandleCLDDataRequest() {
+void ChromeTranslateClient::HandleCLDDataRequest() {
   // Because this function involves arbitrary file system access, it must run
   // on the blocking pool.
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
@@ -451,8 +455,8 @@ void TranslateTabHelper::HandleCLDDataRequest() {
 
 #endif  // defined(CLD2_DYNAMIC_MODE)
 
-void TranslateTabHelper::InitiateTranslation(const std::string& page_lang,
-                                             int attempt) {
+void ChromeTranslateClient::InitiateTranslation(const std::string& page_lang,
+                                                int attempt) {
   if (translate_driver_.GetLanguageState().translation_pending())
     return;
 
@@ -464,7 +468,7 @@ void TranslateTabHelper::InitiateTranslation(const std::string& page_lang,
     int backoff = attempt * kMaxTranslateLoadCheckAttempts;
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
-        base::Bind(&TranslateTabHelper::InitiateTranslation,
+        base::Bind(&ChromeTranslateClient::InitiateTranslation,
                    weak_pointer_factory_.GetWeakPtr(),
                    page_lang,
                    ++attempt),
@@ -476,7 +480,7 @@ void TranslateTabHelper::InitiateTranslation(const std::string& page_lang,
       TranslateDownloadManager::GetLanguageCode(page_lang));
 }
 
-void TranslateTabHelper::OnLanguageDetermined(
+void ChromeTranslateClient::OnLanguageDetermined(
     const LanguageDetectionDetails& details,
     bool page_needs_translation) {
   translate_driver_.GetLanguageState().LanguageDetermined(
@@ -491,10 +495,10 @@ void TranslateTabHelper::OnLanguageDetermined(
       content::Details<const LanguageDetectionDetails>(&details));
 }
 
-void TranslateTabHelper::OnPageTranslated(int32 page_id,
-                                          const std::string& original_lang,
-                                          const std::string& translated_lang,
-                                          TranslateErrors::Type error_type) {
+void ChromeTranslateClient::OnPageTranslated(int32 page_id,
+                                             const std::string& original_lang,
+                                             const std::string& translated_lang,
+                                             TranslateErrors::Type error_type) {
   DCHECK(web_contents());
   translate_manager_->PageTranslated(
       original_lang, translated_lang, error_type);
@@ -509,8 +513,8 @@ void TranslateTabHelper::OnPageTranslated(int32 page_id,
       content::Details<PageTranslatedDetails>(&details));
 }
 
-void TranslateTabHelper::ShowBubble(translate::TranslateStep step,
-                                    TranslateErrors::Type error_type) {
+void ChromeTranslateClient::ShowBubble(translate::TranslateStep step,
+                                       TranslateErrors::Type error_type) {
 // The bubble is implemented only on the desktop platforms.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
diff --git a/chrome/browser/translate/translate_tab_helper.h b/chrome/browser/translate/chrome_translate_client.h
index cab6239..a9f8c3e 100644
--- a/chrome/browser/translate/translate_tab_helper.h
+++ b/chrome/browser/translate/chrome_translate_client.h
@@ -1,9 +1,9 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
-#define CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
+#ifndef CHROME_BROWSER_TRANSLATE_CHROME_TRANSLATE_CLIENT_H_
+#define CHROME_BROWSER_TRANSLATE_CHROME_TRANSLATE_CLIENT_H_
 
 #include <string>
 
@@ -43,12 +43,12 @@ class TranslateAcceptLanguages;
 class TranslatePrefs;
 class TranslateManager;
 
-class TranslateTabHelper
+class ChromeTranslateClient
     : public TranslateClient,
       public content::WebContentsObserver,
-      public content::WebContentsUserData<TranslateTabHelper> {
+      public content::WebContentsUserData<ChromeTranslateClient> {
  public:
-  virtual ~TranslateTabHelper();
+  virtual ~ChromeTranslateClient();
 
   // Gets the LanguageState associated with the page.
   LanguageState& GetLanguageState();
@@ -105,8 +105,8 @@ class TranslateTabHelper
       const GURL& report_url) OVERRIDE;
 
  private:
-  explicit TranslateTabHelper(content::WebContents* web_contents);
-  friend class content::WebContentsUserData<TranslateTabHelper>;
+  explicit ChromeTranslateClient(content::WebContents* web_contents);
+  friend class content::WebContentsUserData<ChromeTranslateClient>;
   friend class test::ScopedCLDDynamicDataHarness;  // For cleaning static state.
 
   // content::WebContentsObserver implementation.
@@ -175,9 +175,9 @@ class TranslateTabHelper
   // Necessary for binding the callback to HandleCLDDataRequest on the blocking
   // pool and for delaying translation initialization until the page has
   // finished loading on a reload.
-  base::WeakPtrFactory<TranslateTabHelper> weak_pointer_factory_;
+  base::WeakPtrFactory<ChromeTranslateClient> weak_pointer_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(TranslateTabHelper);
+  DISALLOW_COPY_AND_ASSIGN(ChromeTranslateClient);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
+#endif  // CHROME_BROWSER_TRANSLATE_CHROME_TRANSLATE_CLIENT_H_
diff --git a/chrome/browser/translate/translate_browser_test_utils.cc b/chrome/browser/translate/translate_browser_test_utils.cc
index bedaab0..aefd8b9 100644
--- a/chrome/browser/translate/translate_browser_test_utils.cc
+++ b/chrome/browser/translate/translate_browser_test_utils.cc
@@ -11,7 +11,7 @@
 #include "base/platform_file.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/component_updater/cld_component_installer.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -155,12 +155,12 @@ void ScopedCLDDynamicDataHarness::ClearStandaloneDataFileState() {
 #if defined(CLD2_DYNAMIC_MODE)
   DLOG(INFO) << "Clearing CLD data file state";
   // This code must live within the class in order to gain "friend" access.
-  base::AutoLock lock(TranslateTabHelper::s_file_lock_.Get());
-  if (TranslateTabHelper::s_cached_file_) {
+  base::AutoLock lock(ChromeTranslateClient::s_file_lock_.Get());
+  if (ChromeTranslateClient::s_cached_file_) {
     // Leaks any open handle, no way to avoid safely.
-    TranslateTabHelper::s_cached_file_ = NULL;
-    TranslateTabHelper::s_cached_data_offset_ = 0;
-    TranslateTabHelper::s_cached_data_length_ = 0;
+    ChromeTranslateClient::s_cached_file_ = NULL;
+    ChromeTranslateClient::s_cached_data_offset_ = 0;
+    ChromeTranslateClient::s_cached_data_length_ = 0;
   }
 #endif  // defined(CLD2_DYNAMIC_MODE)
 }
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 952d824..f8bda83 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_browser_test_utils.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -34,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest,
 
   content::WebContents* current_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(current_web_contents);
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(current_web_contents);
   content::Source<content::WebContents> source(current_web_contents);
 
   ui_test_utils::WindowedNotificationObserverWithDetails<
@@ -51,7 +51,8 @@ IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest,
   EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor(
         source.map_key(), &details));
   EXPECT_EQ("fr", details.adopted_language);
-  EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language());
+  EXPECT_EQ("fr",
+            chrome_translate_client->GetLanguageState().original_language());
 }
 
 #if defined (OS_WIN)
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index fadcd1b..254f435 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
@@ -259,8 +259,8 @@ class TranslateManagerRenderViewHostTest
 
     ChromeRenderViewHostTestHarness::SetUp();
     InfoBarService::CreateForWebContents(web_contents());
-    TranslateTabHelper::CreateForWebContents(web_contents());
-    TranslateTabHelper::FromWebContents(web_contents())
+    ChromeTranslateClient::CreateForWebContents(web_contents());
+    ChromeTranslateClient::FromWebContents(web_contents())
         ->set_translate_max_reload_attempts(0);
 
     notification_registrar_.Add(
@@ -378,15 +378,15 @@ class MockTranslateBubbleFactory : public TranslateBubbleFactory {
       return;
     }
 
-    TranslateTabHelper* translate_tab_helper =
-        TranslateTabHelper::FromWebContents(web_contents);
+    ChromeTranslateClient* chrome_translate_client =
+        ChromeTranslateClient::FromWebContents(web_contents);
     std::string source_language =
-        translate_tab_helper->GetLanguageState().original_language();
+        chrome_translate_client->GetLanguageState().original_language();
     std::string target_language = TranslateDownloadManager::GetLanguageCode(
         g_browser_process->GetApplicationLocale());
     scoped_ptr<TranslateUIDelegate> ui_delegate(
-        new TranslateUIDelegate(translate_tab_helper,
-                                translate_tab_helper->GetTranslateManager(),
+        new TranslateUIDelegate(chrome_translate_client,
+                                chrome_translate_client->GetTranslateManager(),
                                 source_language,
                                 target_language));
     model_.reset(new TranslateBubbleModelImpl(step, ui_delegate.Pass()));
@@ -778,7 +778,7 @@ TEST_F(TranslateManagerRenderViewHostTest, Reload) {
 
   // If we set reload attempts to a high value, we will not see the infobar
   // immediately.
-  TranslateTabHelper::FromWebContents(web_contents())
+  ChromeTranslateClient::FromWebContents(web_contents())
       ->set_translate_max_reload_attempts(100);
   ReloadAndWait(true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
@@ -1068,10 +1068,10 @@ TEST_F(TranslateManagerRenderViewHostTest, NeverTranslateLanguagePref) {
   registrar.Init(prefs);
   registrar.Add(TranslatePrefs::kPrefTranslateBlockedLanguages, pref_callback_);
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(prefs));
+      ChromeTranslateClient::CreateTranslatePrefs(prefs));
   EXPECT_FALSE(translate_prefs->IsBlockedLanguage("fr"));
   TranslateAcceptLanguages* accept_languages =
-      TranslateTabHelper::GetTranslateAcceptLanguages(profile);
+      ChromeTranslateClient::GetTranslateAcceptLanguages(profile);
   EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
   SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateBlockedLanguages);
   translate_prefs->BlockLanguage("fr");
@@ -1118,10 +1118,10 @@ TEST_F(TranslateManagerRenderViewHostTest, NeverTranslateSitePref) {
   registrar.Init(prefs);
   registrar.Add(TranslatePrefs::kPrefTranslateSiteBlacklist, pref_callback_);
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(prefs));
+      ChromeTranslateClient::CreateTranslatePrefs(prefs));
   EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(host));
   TranslateAcceptLanguages* accept_languages =
-      TranslateTabHelper::GetTranslateAcceptLanguages(profile);
+      ChromeTranslateClient::GetTranslateAcceptLanguages(profile);
   EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
   SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateSiteBlacklist);
   translate_prefs->BlacklistSite(host);
@@ -1159,7 +1159,7 @@ TEST_F(TranslateManagerRenderViewHostTest, AlwaysTranslateLanguagePref) {
   registrar.Init(prefs);
   registrar.Add(TranslatePrefs::kPrefTranslateWhitelists, pref_callback_);
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(prefs));
+      ChromeTranslateClient::CreateTranslatePrefs(prefs));
   SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateWhitelists);
   translate_prefs->WhitelistLanguagePair("fr", "en");
 
@@ -1216,7 +1216,7 @@ TEST_F(TranslateManagerRenderViewHostTest, ContextMenu) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(profile->GetPrefs()));
+      ChromeTranslateClient::CreateTranslatePrefs(profile->GetPrefs()));
   translate_prefs->BlockLanguage("fr");
   translate_prefs->BlacklistSite(url.host());
   EXPECT_TRUE(translate_prefs->IsBlockedLanguage("fr"));
@@ -1322,7 +1322,7 @@ TEST_F(TranslateManagerRenderViewHostTest, BeforeTranslateExtraButtons) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(profile->GetPrefs()));
+      ChromeTranslateClient::CreateTranslatePrefs(profile->GetPrefs()));
   translate_prefs->ResetTranslationAcceptedCount("fr");
   translate_prefs->ResetTranslationDeniedCount("fr");
   translate_prefs->ResetTranslationAcceptedCount("de");
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc
index f1dd161..b234eef 100644
--- a/chrome/browser/ui/android/infobars/translate_infobar.cc
+++ b/chrome/browser/ui/android/infobars/translate_infobar.cc
@@ -7,16 +7,16 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_weak_ref.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "jni/TranslateInfoBarDelegate_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
+// ChromeTranslateClient
+// ----------------------------------------------------------
 
-// TranslateTabHelper ----------------------------------------------------------
-
-scoped_ptr<infobars::InfoBar> TranslateTabHelper::CreateInfoBar(
+scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
     scoped_ptr<TranslateInfoBarDelegate> delegate) const {
   return scoped_ptr<infobars::InfoBar>(new TranslateInfoBar(delegate.Pass()));
 }
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.h b/chrome/browser/ui/android/infobars/translate_infobar.h
index 7849347..d7e8441 100644
--- a/chrome/browser/ui/android/infobars/translate_infobar.h
+++ b/chrome/browser/ui/android/infobars/translate_infobar.h
@@ -7,7 +7,7 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/android/infobars/infobar_android.h"
 
 class TranslateInfoBarDelegate;
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 72a4fe4..d8abe54 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -83,7 +83,7 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
@@ -2196,9 +2196,9 @@ void Browser::SetAsDelegate(WebContents* web_contents, Browser* delegate) {
   SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   ZoomController::FromWebContents(web_contents)->set_observer(delegate);
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(web_contents);
-  translate_tab_helper->translate_driver().set_observer(
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(web_contents);
+  chrome_translate_client->translate_driver().set_observer(
       delegate ? delegate->translate_driver_observer_.get() : NULL);
 }
 
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index e7541f0..3461fcb 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -29,8 +29,8 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service_factory.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_browser_test_utils.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
@@ -1417,20 +1417,22 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
 
   WebContents* current_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(current_web_contents);
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(current_web_contents);
   content::Source<WebContents> source(current_web_contents);
 
   ui_test_utils::WindowedNotificationObserverWithDetails<
     LanguageDetectionDetails>
       en_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
                                   source);
-  EXPECT_EQ("", translate_tab_helper->GetLanguageState().original_language());
+  EXPECT_EQ("",
+            chrome_translate_client->GetLanguageState().original_language());
   en_language_detected_signal.Wait();
   EXPECT_TRUE(en_language_detected_signal.GetDetailsFor(
         source.map_key(), &details));
   EXPECT_EQ("en", details.adopted_language);
-  EXPECT_EQ("en", translate_tab_helper->GetLanguageState().original_language());
+  EXPECT_EQ("en",
+            chrome_translate_client->GetLanguageState().original_language());
 
   // Now navigate to a page in French.
   ui_test_utils::WindowedNotificationObserverWithDetails<
@@ -1444,7 +1446,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
   EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor(
         source.map_key(), &details));
   EXPECT_EQ("fr", details.adopted_language);
-  EXPECT_EQ("fr", translate_tab_helper->GetLanguageState().original_language());
+  EXPECT_EQ("fr",
+            chrome_translate_client->GetLanguageState().original_language());
 }
 
 // Chromeos defaults to restoring the last session, so this test isn't
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 6252959..38cff6b 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -32,7 +32,7 @@
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/signin/signin_header_helper.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
@@ -762,14 +762,14 @@ void Translate(Browser* browser) {
 
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(web_contents);
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(web_contents);
 
   translate::TranslateStep step = translate::TRANSLATE_STEP_BEFORE_TRANSLATE;
-  if (translate_tab_helper) {
-    if (translate_tab_helper->GetLanguageState().translation_pending())
+  if (chrome_translate_client) {
+    if (chrome_translate_client->GetLanguageState().translation_pending())
       step = translate::TRANSLATE_STEP_TRANSLATING;
-    else if (translate_tab_helper->GetLanguageState().IsPageTranslated())
+    else if (chrome_translate_client->GetLanguageState().IsPageTranslated())
       step = translate::TRANSLATE_STEP_AFTER_TRANSLATE;
   }
   browser->window()->ShowTranslateBubble(
diff --git a/chrome/browser/ui/browser_content_translate_driver_observer.cc b/chrome/browser/ui/browser_content_translate_driver_observer.cc
index f1bdaa2..573d247 100644
--- a/chrome/browser/ui/browser_content_translate_driver_observer.cc
+++ b/chrome/browser/ui/browser_content_translate_driver_observer.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/browser_content_translate_driver_observer.h"
 
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -21,9 +21,9 @@ BrowserContentTranslateDriverObserver::
 void BrowserContentTranslateDriverObserver::OnIsPageTranslatedChanged(
     content::WebContents* source) {
   if (source == browser_->tab_strip_model()->GetActiveWebContents()) {
-    TranslateTabHelper* translate_tab_helper =
-        TranslateTabHelper::FromWebContents(source);
-    LanguageState& language_state = translate_tab_helper->GetLanguageState();
+    ChromeTranslateClient* chrome_translate_client =
+        ChromeTranslateClient::FromWebContents(source);
+    LanguageState& language_state = chrome_translate_client->GetLanguageState();
     browser_->window()->SetTranslateIconToggled(
         language_state.IsPageTranslated());
   }
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h
index 96fcc89..3b05a8f 100644
--- a/chrome/browser/ui/browser_window.h
+++ b/chrome/browser/ui/browser_window.h
@@ -8,7 +8,7 @@
 #include "base/callback_forward.h"
 #include "chrome/browser/lifetime/browser_close_manager.h"
 #include "chrome/browser/signin/signin_header_helper.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 3213b7d..ef00a2e 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -21,7 +21,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_header_helper.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands_mac.h"
@@ -494,9 +494,9 @@ void BrowserWindowCocoa::ShowBookmarkAppBubble(
 void BrowserWindowCocoa::ShowTranslateBubble(content::WebContents* contents,
                                              translate::TranslateStep step,
                                              TranslateErrors::Type error_type) {
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(contents);
-  LanguageState& language_state = translate_tab_helper->GetLanguageState();
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(contents);
+  LanguageState& language_state = chrome_translate_client->GetLanguageState();
   language_state.SetTranslateEnabled(true);
 
   [controller_ showTranslateBubbleForWebContents:contents
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 8fb3e02..0748411 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -14,7 +14,7 @@
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index dbe0d7b..5793c5c 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -27,7 +27,7 @@
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
@@ -1784,12 +1784,12 @@ enum {
 
   std::string sourceLanguage;
   std::string targetLanguage;
-  TranslateTabHelper::GetTranslateLanguages(contents,
-                                            &sourceLanguage, &targetLanguage);
+  ChromeTranslateClient::GetTranslateLanguages(
+      contents, &sourceLanguage, &targetLanguage);
 
   scoped_ptr<TranslateUIDelegate> uiDelegate(new TranslateUIDelegate(
-      TranslateTabHelper::FromWebContents(contents),
-      TranslateTabHelper::GetManagerFromWebContents(contents),
+      ChromeTranslateClient::FromWebContents(contents),
+      ChromeTranslateClient::GetManagerFromWebContents(contents),
       sourceLanguage,
       targetLanguage));
   scoped_ptr<TranslateBubbleModel> model(
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm
index 331b3dd..07fb26b 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#import "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #include "chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h"
@@ -28,7 +28,7 @@ using InfoBarUtilities::VerifyControlOrderAndSpacing;
 using InfoBarUtilities::CreateLabel;
 using InfoBarUtilities::AddMenuItem;
 
-scoped_ptr<infobars::InfoBar> TranslateTabHelper::CreateInfoBar(
+scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
     scoped_ptr<TranslateInfoBarDelegate> delegate) const {
   scoped_ptr<InfoBarCocoa> infobar(
       new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>()));
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
index 8d8234f..9d1aca0 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
@@ -8,7 +8,7 @@
 #import "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#import "chrome/browser/translate/translate_tab_helper.h"
+#import "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
@@ -41,8 +41,8 @@ class MockTranslateInfoBarDelegate : public TranslateInfoBarDelegate {
                                translate::TranslateStep step,
                                TranslateErrors::Type error)
       : TranslateInfoBarDelegate(
-            TranslateTabHelper::GetManagerFromWebContents(
-                web_contents)->GetWeakPtr(),
+            ChromeTranslateClient::GetManagerFromWebContents(web_contents)
+                ->GetWeakPtr(),
             false,
             step,
             NULL,
@@ -79,7 +79,7 @@ class TranslationInfoBarTest : public CocoaProfileTest {
     web_contents_.reset(
         WebContents::Create(WebContents::CreateParams(profile())));
     InfoBarService::CreateForWebContents(web_contents_.get());
-    TranslateTabHelper::CreateForWebContents(web_contents_.get());
+    ChromeTranslateClient::CreateForWebContents(web_contents_.get());
   }
 
   virtual void TearDown() OVERRIDE {
@@ -96,12 +96,12 @@ class TranslationInfoBarTest : public CocoaProfileTest {
       error = TranslateErrors::NETWORK;
     [[infobar_controller_ view] removeFromSuperview];
 
-    TranslateTabHelper* translate_tab_helper =
-        TranslateTabHelper::FromWebContents(web_contents_.get());
+    ChromeTranslateClient* chrome_translate_client =
+        ChromeTranslateClient::FromWebContents(web_contents_.get());
     scoped_ptr<TranslateInfoBarDelegate> delegate(
         new MockTranslateInfoBarDelegate(web_contents_.get(), type, error));
     scoped_ptr<infobars::InfoBar> infobar(
-        translate_tab_helper->CreateInfoBar(delegate.Pass()));
+        chrome_translate_client->CreateInfoBar(delegate.Pass()));
     if (infobar_)
       infobar_->CloseSoon();
     infobar_ = static_cast<InfoBarCocoa*>(infobar.release());
@@ -242,7 +242,7 @@ TEST_F(TranslationInfoBarTest, Bug36895) {
 // after doing 3 translations.
 TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(profile()->GetPrefs()));
+      ChromeTranslateClient::CreateTranslatePrefs(profile()->GetPrefs()));
   translate_prefs->ResetTranslationAcceptedCount("en");
   for (int i = 0; i < 4; ++i) {
     translate_prefs->IncrementTranslationAcceptedCount("en");
@@ -258,7 +258,7 @@ TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
 // after denying 3 translations.
 TEST_F(TranslationInfoBarTest, TriggerShowNeverTranslateButton) {
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(profile()->GetPrefs()));
+      ChromeTranslateClient::CreateTranslatePrefs(profile()->GetPrefs()));
   translate_prefs->ResetTranslationDeniedCount("en");
   for (int i = 0; i < 4; ++i) {
     translate_prefs->IncrementTranslationDeniedCount("en");
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index 170b37f..3f9a7a8 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -30,8 +30,8 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
@@ -766,7 +766,7 @@ void LocationBarViewMac::UpdateTranslateDecoration() {
   if (!web_contents)
     return;
   LanguageState& language_state =
-      TranslateTabHelper::FromWebContents(web_contents)->GetLanguageState();
+      ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
   bool enabled = language_state.translate_enabled();
   command_updater()->UpdateCommandEnabled(IDC_TRANSLATE_PAGE, enabled);
   translate_decoration_->SetVisible(enabled);
diff --git a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.h b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.h
index 499b9c9..4c5ef61 100644
--- a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.h
@@ -6,7 +6,7 @@
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "components/translate/core/common/translate_errors.h"
 
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index abdad85..5537ef9 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
@@ -140,7 +140,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   SearchTabHelper::CreateForWebContents(web_contents);
   SSLTabHelper::CreateForWebContents(web_contents);
   TabSpecificContentSettings::CreateForWebContents(web_contents);
-  TranslateTabHelper::CreateForWebContents(web_contents);
+  ChromeTranslateClient::CreateForWebContents(web_contents);
 
   // --- Platform-specific tab helpers ---
 
diff --git a/chrome/browser/ui/translate/translate_bubble_factory.h b/chrome/browser/ui/translate/translate_bubble_factory.h
index 8a579ee..b1b3b68 100644
--- a/chrome/browser/ui/translate/translate_bubble_factory.h
+++ b/chrome/browser/ui/translate/translate_bubble_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_BUBBLE_FACTORY_H_
 #define CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_BUBBLE_FACTORY_H_
 
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "components/translate/core/common/translate_errors.h"
 
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.cc b/chrome/browser/ui/translate/translate_bubble_model_impl.cc
index 57543fe..195e886 100644
--- a/chrome/browser/ui/translate/translate_bubble_model_impl.cc
+++ b/chrome/browser/ui/translate/translate_bubble_model_impl.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
 
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/translate_ui_delegate.h"
 
diff --git a/chrome/browser/ui/translate/translate_bubble_model_impl.h b/chrome/browser/ui/translate/translate_bubble_model_impl.h
index 1115409..0d911d2 100644
--- a/chrome/browser/ui/translate/translate_bubble_model_impl.h
+++ b/chrome/browser/ui/translate/translate_bubble_model_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_view_state_transition.h"
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9161b8b..f0f0c1f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -36,7 +36,7 @@
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
@@ -1167,9 +1167,9 @@ void BrowserView::ShowTranslateBubble(content::WebContents* web_contents,
       return;
   }
 
-  TranslateTabHelper* translate_tab_helper =
-      TranslateTabHelper::FromWebContents(web_contents);
-  LanguageState& language_state = translate_tab_helper->GetLanguageState();
+  ChromeTranslateClient* chrome_translate_client =
+      ChromeTranslateClient::FromWebContents(web_contents);
+  LanguageState& language_state = chrome_translate_client->GetLanguageState();
   language_state.SetTranslateEnabled(true);
 
   TranslateBubbleView::ShowBubble(
diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc
index 5f1a753..453e4e4 100644
--- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc
+++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/views/infobars/translate_infobar_base.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/views/infobars/after_translate_infobar.h"
 #include "chrome/browser/ui/views/infobars/before_translate_infobar.h"
 #include "chrome/browser/ui/views/infobars/translate_message_infobar.h"
@@ -18,10 +18,10 @@
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
 
+// ChromeTranslateClient
+// ----------------------------------------------------------
 
-// TranslateTabHelper ----------------------------------------------------------
-
-scoped_ptr<infobars::InfoBar> TranslateTabHelper::CreateInfoBar(
+scoped_ptr<infobars::InfoBar> ChromeTranslateClient::CreateInfoBar(
     scoped_ptr<TranslateInfoBarDelegate> delegate) const {
   if (delegate->translate_step() ==
       translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index cddebba..0fedab7 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -28,8 +28,8 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
@@ -1277,8 +1277,8 @@ void LocationBarView::RefreshTranslateIcon() {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
-  LanguageState& language_state = TranslateTabHelper::FromWebContents(
-      web_contents)->GetLanguageState();
+  LanguageState& language_state =
+      ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
   bool enabled = language_state.translate_enabled();
   command_updater()->UpdateCommandEnabled(IDC_TRANSLATE_PAGE, enabled);
   translate_icon_view_->SetVisible(enabled);
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index 9f1d43c..1908873 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -15,8 +15,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
 #include "chrome/common/url_constants.h"
@@ -138,12 +138,12 @@ void TranslateBubbleView::ShowBubble(views::View* anchor_view,
 
   std::string source_language;
   std::string target_language;
-  TranslateTabHelper::GetTranslateLanguages(web_contents,
-                                            &source_language, &target_language);
+  ChromeTranslateClient::GetTranslateLanguages(
+      web_contents, &source_language, &target_language);
 
   scoped_ptr<TranslateUIDelegate> ui_delegate(new TranslateUIDelegate(
-      TranslateTabHelper::FromWebContents(web_contents),
-      TranslateTabHelper::GetManagerFromWebContents(web_contents),
+      ChromeTranslateClient::FromWebContents(web_contents),
+      ChromeTranslateClient::GetManagerFromWebContents(web_contents),
       source_language,
       target_language));
   scoped_ptr<TranslateBubbleModel> model(
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
index a3457cc..94a561a 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.h
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/translate/language_combobox_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "components/translate/core/common/translate_errors.h"
diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc
index fc957aa..b2ed9d2 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_common.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc
@@ -21,8 +21,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -267,7 +267,7 @@ void LanguageOptionsHandlerCommon::UpdateLanguageListCallback(
 
   Profile* profile = Profile::FromWebUI(web_ui());
   scoped_ptr<TranslatePrefs> translate_prefs =
-      TranslateTabHelper::CreateTranslatePrefs(profile->GetPrefs());
+      ChromeTranslateClient::CreateTranslatePrefs(profile->GetPrefs());
   translate_prefs->UpdateLanguageList(languages);
 }
 
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
index 6603d93..ff41176 100644
--- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
+++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
@@ -13,8 +13,8 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/common/pref_names.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_error_details.h"
@@ -127,7 +127,7 @@ void TranslateInternalsHandler::OnRemovePrefItem(const base::ListValue* args) {
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
   scoped_ptr<TranslatePrefs> translate_prefs(
-      TranslateTabHelper::CreateTranslatePrefs(prefs));
+      ChromeTranslateClient::CreateTranslatePrefs(prefs));
 
   std::string pref_name;
   if (!args->GetString(0, &pref_name))
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d97d760..17bb6d6 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2524,12 +2524,12 @@
         'browser/thumbnails/thumbnailing_algorithm.h',
         'browser/thumbnails/thumbnailing_context.cc',
         'browser/thumbnails/thumbnailing_context.h',
+        'browser/translate/chrome_translate_client.cc',
+        'browser/translate/chrome_translate_client.h',
         'browser/translate/translate_accept_languages_factory.cc',
         'browser/translate/translate_accept_languages_factory.h',
         'browser/translate/translate_service.cc',
         'browser/translate/translate_service.h',
-        'browser/translate/translate_tab_helper.cc',
-        'browser/translate/translate_tab_helper.h',
         'browser/undo/bookmark_renumber_observer.h',
         'browser/undo/bookmark_undo_service.cc',
         'browser/undo/bookmark_undo_service.h',