Reverting the CLD CL altogether, the reliability bot is still red.

BUG=30681
TEST=None
TBR=brettw
Review URL: http://codereview.chromium.org/504048

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

15 files changed, 71 insertions, 287 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 52eedad..83ec198 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1189,8 +1189,8 @@ void Browser::OpenCreateShortcutsDialog() {
   DCHECK(pending_web_app_action_ == NONE);
   pending_web_app_action_ = CREATE_SHORTCUT;
 
-  // Start fetching web app info for CreateApplicationShortcut dialog and show
-  // the dialog when the data is available in OnDidGetApplicationInfo.
+  // Start fetching web app info for CreateApplicatoinShortcut dialog and
+  // show the dialog when the data is available in OnDidGetApplicationInfo.
   current_tab->render_view_host()->GetApplicationInfo(entry->page_id());
 #else
   NOTIMPLEMENTED();
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 62d3a51..756b7dc 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -288,38 +288,3 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconOfOnloadRedirectToAnchorPage) {
       controller().GetActiveEntry();
   EXPECT_EQ(expected_favicon_url.spec(), entry->favicon().url().spec());
 }
-
-// The CLD library only works on Windows at this point.
-#if defined(OS_WIN)
-// Tests that the CLD (Compact Language Detection) works properly.
-// TODO(jcampan): http://crbug.com/30662 the language detection has been
-//                temporarily disabled.
-IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_PageLanguageDetection) {
-  static const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server(
-        HTTPTestServer::CreateServer(kDocRoot, NULL));
-  ASSERT_TRUE(NULL != server.get());
-
-  TabContents* current_tab = browser()->GetSelectedTabContents();
-
-  // Navigate to a page in English.
-  ui_test_utils::NavigateToURL(
-      browser(), GURL(server->TestServerPage("files/english_page.html")));
-  NavigationEntry* entry = current_tab->controller().GetActiveEntry();
-  ASSERT_TRUE(NULL != entry);
-  EXPECT_TRUE(entry->language().empty());
-  std::string lang = ui_test_utils::WaitForLanguageDetection(current_tab);
-  EXPECT_EQ("en", lang);
-  EXPECT_EQ("en", entry->language());
-
-  // Now navigate to a page in French.
-  ui_test_utils::NavigateToURL(
-      browser(), GURL(server->TestServerPage("files/french_page.html")));
-  entry = current_tab->controller().GetActiveEntry();
-  ASSERT_TRUE(NULL != entry);
-  EXPECT_TRUE(entry->language().empty());
-  lang = ui_test_utils::WaitForLanguageDetection(current_tab);
-  EXPECT_EQ("fr", lang);
-  EXPECT_EQ("fr", entry->language());
-}
-#endif
diff --git a/chrome/browser/cld_helper.cc b/chrome/browser/cld_helper.cc
deleted file mode 100644
index 4bed10e..0000000
--- a/chrome/browser/cld_helper.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2009 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/cld_helper.h"
-
-#include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/common/notification_service.h"
-
-#if defined(OS_WIN)
-// TODO(port): The compact language detection library works only for Windows.
-#include "third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h"
-#endif
-
-CLDHelper::CLDHelper(int process_id, int routing_id, int page_id,
-                     const std::wstring& page_content)
-    : process_id_(process_id),
-      routing_id_(routing_id),
-      page_id_(page_id),
-      page_content_(page_content) {
-}
-
-void CLDHelper::DetectLanguage() {
-  // Balanced in DetectionDone.
-  AddRef();
-
-  // Do the actual work on the file thread.
-  ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
-                         NewRunnableMethod(this, &CLDHelper::DoDetectLanguage));
-}
-
-void CLDHelper::DoDetectLanguage() {
-#if defined(OS_WIN)  // Only for windows.
-// TODO(jcampan): http://crbug.com/30662 the detection language library crashes
-//                on some sites and has been temporarily disabled.
-#if 0
-  int num_languages = 0;
-  bool is_reliable = false;
-  const char* language_iso_code = LanguageCodeISO639_1(
-      DetectLanguageOfUnicodeText(page_content_.c_str(), true, &is_reliable,
-                                  &num_languages, NULL));
-  language_ = language_iso_code;
-#endif
-#else
-  // TODO(jcampan): port the compact language detection library.
-  NOTIMPLEMENTED();
-#endif
-
-  // Work is done, notify the RenderViewHost on the UI thread.
-  ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
-                         NewRunnableMethod(this, &CLDHelper::DetectionDone));
-}
-
-void CLDHelper::DetectionDone() {
-  RenderViewHost* rvh = RenderViewHost::FromID(process_id_, routing_id_);
-  // The RenderViewHost might be gone (tab closed for example) while we were
-  // performing the detection.
-  if (rvh) {
-    NotificationService::current()->Notify(
-        NotificationType::TAB_LANGUAGE_DETERMINED,
-        Source<RenderViewHost>(rvh),
-        Details<std::string>(&language_));
-  }
-
-  // Remove the ref we added to ourself in DetectLanguage().
-  Release();
-}
diff --git a/chrome/browser/cld_helper.h b/chrome/browser/cld_helper.h
deleted file mode 100644
index 0251145..0000000
--- a/chrome/browser/cld_helper.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2009 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_CLD_HELPER_H_
-#define CHROME_BROWSER_CLD_HELPER_H_
-
-#include <string>
-
-#include "base/ref_counted.h"
-
-// The CLDHelper class detects the language of a page, using the toolbar CLD
-// detection library. (CLD stands for Compact Language Detection.)
-// It should be created and the detection process started on the same thread.
-// The detection happens on the file thread and a TAB_LANGUAGE_DETERMINED
-// notification is sent (on the UI thread) when the language has been detected.
-class CLDHelper : public base::RefCountedThreadSafe<CLDHelper> {
- public:
-  // |process_id| and |routing_id| should reference the RenderViewHost this page
-  // is related to. |page_id| is the id of the page for the specified
-  // |page_contents|.
-  CLDHelper(int process_id,
-            int routing_id,
-            int page_id,
-            const std::wstring& page_content);
-
-  // Starts the process of detecting the language of the page.
-  void DetectLanguage();
-
-  int page_id() const { return page_id_; }
-
-  std::string language() const { return language_; }
-
- private:
-  // Private because the class is ref counted.
-  friend class base::RefCountedThreadSafe<CLDHelper>;
-  ~CLDHelper() {}
-
-  // Performs the actual work of detecting the language.
-  void DoDetectLanguage();
-
-  // Invoked on the UI thread once the language has been detected.
-  void DetectionDone();
-
-  // The process id and routing id of the RenderViewHost for which the language
-  // is being detected.
-  int process_id_;
-  int routing_id_;
-
-  // The id and content of the page for which the language is being detected.
-  int page_id_;
-  std::wstring page_content_;
-
-  // The language that was detected.
-  std::string language_;
-
-  DISALLOW_COPY_AND_ASSIGN(CLDHelper);
-};
-
-#endif  // CHROME_BROWSER_CLD_HELPER_H_
-
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index cd68b1a..97ef316 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -89,9 +89,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) {
   EXPECT_TRUE(result);
 
 #if defined(OS_WIN)
-// TODO(jcampan): http://crbug.com/30662 the language detection has been
-//                temporarily disabled.
-#if 0
   // http://crbug.com/29896 - tabs.detectLanguage is Windows only
 
   // Test for compact language detection API. First navigate to a (static) html
@@ -108,7 +105,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) {
       host->render_view_host(), L"", L"testTabsLanguageAPI()", &result);
   EXPECT_TRUE(result);
 #endif
-#endif
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ExtensionViews) {
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index a97e098..64ee348 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -839,24 +839,15 @@ bool DetectTabLanguageFunction::RunImpl() {
       return false;
   }
 
-  AddRef();  // Balanced in GotLanguage()
-
-  NavigationEntry* entry = contents->controller().GetActiveEntry();
-  if (entry) {
-    std::string language = entry->language();
-    if (!language.empty()) {
-      // Delay the callback invocation until after the current JS call has
-      // returned.
-      MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
-          this, &DetectTabLanguageFunction::GotLanguage, language));
-      return true;
-    }
-  }
-  // The tab contents does not know its language yet.  Let's  wait until it
-  // receives it.
+  // Figure out what language |contents| contains. This sends an async call via
+  // the browser to the renderer to determine the language of the tab the
+  // renderer has. The renderer sends back the language of the tab after the
+  // tab loads (it may be delayed) to the browser, which in turn notifies this
+  // object that the language has been received.
+  contents->GetPageLanguage();
   registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED,
-                 Source<RenderViewHost>(contents->render_view_host()));
-
+      NotificationService::AllSources());
+  AddRef();  // balanced in Observe()
   return true;
 }
 
@@ -865,16 +856,9 @@ void DetectTabLanguageFunction::Observe(NotificationType type,
                                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_LANGUAGE_DETERMINED);
   std::string language(*Details<std::string>(details).ptr());
-  registrar_.Remove(this, NotificationType::TAB_LANGUAGE_DETERMINED, source);
-
-  GotLanguage(language);
-}
-
-void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
-
-  Release();  // Balanced in Run()
+  Release();  // balanced in Run()
 }
 
 // static helpers
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index 4a0ec45..1fa7f21 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -131,7 +131,6 @@ class DetectTabLanguageFunction : public AsyncExtensionFunction,
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
-  void GotLanguage(const std::string& language);
   NotificationRegistrar registrar_;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.detectLanguage")
 };
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index c164fb8..bb7e99d 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -733,9 +733,10 @@ bool BrowserRenderProcessHost::Send(IPC::Message* msg) {
 void BrowserRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
   mark_child_process_activity_time();
   if (msg.routing_id() == MSG_ROUTING_CONTROL) {
-    // Dispatch control messages.
+    // dispatch control messages
     bool msg_is_ok = true;
     IPC_BEGIN_MESSAGE_MAP_EX(BrowserRenderProcessHost, msg, msg_is_ok)
+      IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
       IPC_MESSAGE_HANDLER(ViewHostMsg_UpdatedCacheStats,
                           OnUpdatedCacheStats)
       IPC_MESSAGE_HANDLER(ViewHostMsg_SuddenTerminationChanged,
@@ -759,7 +760,7 @@ void BrowserRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
     return;
   }
 
-  // Dispatch incoming messages to the appropriate TabContents.
+  // dispatch incoming messages to the appropriate TabContents
   IPC::Channel::Listener* listener = GetListenerByID(msg.routing_id());
   if (!listener) {
     if (msg.is_sync()) {
@@ -833,6 +834,18 @@ void BrowserRenderProcessHost::OnChannelError() {
   // TODO(darin): clean this up
 }
 
+void BrowserRenderProcessHost::OnPageContents(const GURL& url,
+                                              int32 page_id,
+                                              const std::wstring& contents) {
+  Profile* p = profile();
+  if (!p || p->IsOffTheRecord())
+    return;
+
+  HistoryService* hs = p->GetHistoryService(Profile::IMPLICIT_ACCESS);
+  if (hs)
+    hs->SetPageContents(url, contents);
+}
+
 void BrowserRenderProcessHost::OnUpdatedCacheStats(
     const WebCache::UsageStats& stats) {
   WebCacheManager::GetInstance()->ObserveStats(id(), stats);
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index a5c536d..cd94bf5 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -104,6 +104,8 @@ class BrowserRenderProcessHost : public RenderProcessHost,
   friend class VisitRelayingRenderProcessHost;
 
   // Control message handlers.
+  void OnPageContents(const GURL& url, int32 page_id,
+                      const std::wstring& contents);
   void OnUpdatedCacheStats(const WebKit::WebCache::UsageStats& stats);
   void SuddenTerminationChanged(bool enabled);
   void OnExtensionAddListener(const std::string& event_name);
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 136ad7a..d67fda3 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -46,6 +46,8 @@
 #if defined(OS_WIN)
 // TODO(port): accessibility not yet implemented. See http://crbug.com/8288.
 #include "chrome/browser/browser_accessibility_manager.h"
+// TODO(port): The compact language detection library works only for Windows.
+#include "third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/win/cld_unicodetext.h"
 #endif
 
 using base::TimeDelta;
@@ -421,6 +423,10 @@ void RenderViewHost::StopFinding(bool clear_selection) {
   Send(new ViewMsg_StopFinding(routing_id(), clear_selection));
 }
 
+void RenderViewHost::GetPageLanguage() {
+  Send(new ViewMsg_DeterminePageText(routing_id()));
+}
+
 void RenderViewHost::Zoom(PageZoom::Function function) {
   Send(new ViewMsg_Zoom(routing_id(), function));
 }
@@ -753,6 +759,8 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidFailProvisionalLoadWithError,
                         OnMsgDidFailProvisionalLoadWithError)
     IPC_MESSAGE_HANDLER(ViewHostMsg_Find_Reply, OnMsgFindReply)
+    IPC_MESSAGE_HANDLER(ViewMsg_DeterminePageText_Reply,
+                        OnDeterminePageTextReply)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteCodeFinished,
                         OnExecuteCodeFinished)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFavIconURL, OnMsgUpdateFavIconURL)
@@ -836,7 +844,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_AccessibilityFocusChange,
                         OnAccessibilityFocusChange)
     IPC_MESSAGE_HANDLER(ViewHostMsg_OnCSSInserted, OnCSSInserted)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
     // Have the super handle all other messages.
     IPC_MESSAGE_UNHANDLED(RenderWidgetHost::OnMessageReceived(msg))
   IPC_END_MESSAGE_MAP_EX()
@@ -1140,6 +1147,22 @@ void RenderViewHost::OnMsgFindReply(int request_id,
   Send(new ViewMsg_FindReplyACK(routing_id()));
 }
 
+void RenderViewHost::OnDeterminePageTextReply(
+    const std::wstring& page_text) {
+#if defined(OS_WIN)  // Only for windows.
+    int num_languages = 0;
+    bool is_reliable = false;
+    const char* language_iso_code = LanguageCodeISO639_1(
+        DetectLanguageOfUnicodeText(page_text.c_str(), true, &is_reliable,
+                                    &num_languages, NULL));
+    std::string language(language_iso_code);
+    NotificationService::current()->Notify(
+        NotificationType::TAB_LANGUAGE_DETERMINED,
+        Source<RenderViewHost>(this),
+        Details<std::string>(&language));
+#endif
+}
+
 void RenderViewHost::OnExecuteCodeFinished(int request_id, bool success) {
   std::pair<int, bool> result_details(request_id, success);
   NotificationService::current()->Notify(
@@ -1760,13 +1783,3 @@ void RenderViewHost::OnAccessibilityFocusChange(int acc_obj_id) {
 void RenderViewHost::OnCSSInserted() {
   delegate_->DidInsertCSS();
 }
-
-void RenderViewHost::OnPageContents(const GURL& url,
-                                    int32 page_id,
-                                    const std::wstring& contents) {
-  RenderViewHostDelegate::BrowserIntegration* integration_delegate =
-      delegate_->GetBrowserIntegrationDelegate();
-  if (!integration_delegate)
-    return;
-  integration_delegate->OnPageContents(url, page_id, contents);
-}
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index f3b1a32..0d923ca 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -212,6 +212,12 @@ class RenderViewHost : public RenderWidgetHost,
   // clear the selection on the focused frame.
   void StopFinding(bool clear_selection);
 
+  // Get the most probable language of the text content in the tab. This sends
+  // a message to the render view to get the content of the page as text. The
+  // caller gets the language via the NotificationService by registering to the
+  // NotificationType TAB_LANGUAGE_DETERMINED.
+  void GetPageLanguage();
+
   // Change the zoom level of a page.
   void Zoom(PageZoom::Function function);
 
@@ -417,22 +423,22 @@ class RenderViewHost : public RenderWidgetHost,
   // Creates a new RenderWidget with the given route id.
   void CreateNewWidget(int route_id, bool activatable);
 
-  // Sends the response to an extension api call.
+  // Send the response to an extension api call.
   void SendExtensionResponse(int request_id, bool success,
                              const std::string& response,
                              const std::string& error);
 
-  // Sends a response to an extension api call that it was blocked for lack of
+  // Send a response to an extension api call that it was blocked for lack of
   // permission.
   void BlockExtensionRequest(int request_id);
 
-  // Notifies the renderer that its view type has changed.
+  // Notify the renderer that its view type has changed.
   void ViewTypeChanged(ViewType::Type type);
 
-  // Tells the renderer which browser window it is being attached to.
+  // Tell renderer which browser window it is being attached to.
   void UpdateBrowserWindowId(int window_id);
 
-  // Tells the render view that a custom context action has been selected.
+  // Tell render view that custom context action has been selected.
   void PerformCustomContextMenuAction(unsigned action);
 
  protected:
@@ -489,6 +495,7 @@ class RenderViewHost : public RenderWidgetHost,
                       const gfx::Rect& selection_rect,
                       int active_match_ordinal,
                       bool final_update);
+  void OnDeterminePageTextReply(const std::wstring& tab_text);
   void OnExecuteCodeFinished(int request_id, bool success);
   void OnMsgUpdateFavIconURL(int32 page_id, const GURL& icon_url);
   void OnMsgDidDownloadFavIcon(int id,
@@ -586,9 +593,6 @@ class RenderViewHost : public RenderWidgetHost,
   void OnExtensionPostMessage(int port_id, const std::string& message);
   void OnAccessibilityFocusChange(int acc_obj_id);
   void OnCSSInserted();
-  void OnPageContents(const GURL& url,
-                      int32 page_id,
-                      const std::wstring& contents);
 
  private:
   friend class TestRenderViewHost;
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index cf426f6..c3df62d 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -217,11 +217,6 @@ class RenderViewHostDelegate {
     virtual void OnDidGetApplicationInfo(
         int32 page_id,
         const webkit_glue::WebApplicationInfo& app_info) = 0;
-
-    // Notification that the contents of the page has been loaded.
-    virtual void OnPageContents(const GURL& url,
-                                int32 page_id,
-                                const std::wstring& contents) = 0;
   };
 
   // Resource ------------------------------------------------------------------
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index df6ad06..e679c10 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -389,15 +389,6 @@ class NavigationEntry {
     return restore_type_;
   }
 
-  // The ISO 639-1 language code (ex: en, fr, zh...) for the page.
-  // Can be empty if the language was not detected yet or is unknown.
-  void set_language(const std::string& language) {
-    language_ = language;
-  }
-  std::string language() const {
-    return language_;
-  }
-
  private:
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
@@ -422,7 +413,6 @@ class NavigationEntry {
   GURL user_typed_url_;
   bool has_post_data_;
   RestoreType restore_type_;
-  std::string language_;  // ISO 639-1 language code.
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index b4acc38..fd97827 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1070,6 +1070,10 @@ void TabContents::StopFinding(bool clear_selection) {
   render_view_host()->StopFinding(clear_selection);
 }
 
+void TabContents::GetPageLanguage() {
+  render_view_host()->GetPageLanguage();
+}
+
 void TabContents::OnSavePage() {
   // If we can not save the page, try to download it.
   if (!SavePackage::IsSavableContents(contents_mime_type())) {
@@ -1725,40 +1729,6 @@ void TabContents::OnDidGetApplicationInfo(
     delegate()->OnDidGetApplicationInfo(this, page_id);
 }
 
-void TabContents::OnPageContents(const GURL& url,
-                                 int32 page_id,
-                                 const std::wstring& contents) {
-  // Don't index any https pages. People generally don't want their bank
-  // accounts, etc. indexed on their computer, especially since some of these
-  // things are not marked cachable.
-  // TODO(brettw) we may want to consider more elaborate heuristics such as
-  // the cachability of the page. We may also want to consider subframes (this
-  // test will still index subframes if the subframe is SSL).
-  if (!url.SchemeIsSecure()) {
-    Profile* p = profile();
-    if (!p || p->IsOffTheRecord())
-      return;
-
-    HistoryService* hs = p->GetHistoryService(Profile::IMPLICIT_ACCESS);
-    if (hs)
-      hs->SetPageContents(url, contents);
-  }
-
-
-// TODO(port): Port detection language to Mac and Linux.
-#if defined(OS_WIN)
-  // Detect the page language.  The detection happens on the file thread.
-  // We get the TAB_LANGUAGE_DETERMINED notification when the language has been
-  // detected.
-  registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED,
-                 Source<RenderViewHost>(render_view_host()));
-  cld_helper_ = new CLDHelper(render_view_host()->process()->id(),
-                              render_view_host()->routing_id(),
-                              page_id, contents);
-  cld_helper_->DetectLanguage();
-#endif
-}
-
 void TabContents::DidStartProvisionalLoadForFrame(
     RenderViewHost* render_view_host,
     bool is_main_frame,
@@ -2620,20 +2590,6 @@ void TabContents::Observe(NotificationType type,
     }
 #endif
 
-    case NotificationType::TAB_LANGUAGE_DETERMINED: {
-      DCHECK(cld_helper_.get());
-      DCHECK(cld_helper_->language() == *Details<std::string>(details).ptr());
-
-      registrar_.Remove(this, NotificationType::TAB_LANGUAGE_DETERMINED,
-                        Source<RenderViewHost>(source));
-
-      NavigationEntry* entry = controller_.GetActiveEntry();
-      if (entry && entry->page_id() == cld_helper_->page_id())
-        entry->set_language(cld_helper_->language());
-      cld_helper_.release();
-      break;
-    }
-
     default:
       NOTREACHED();
   }
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index bd74602..2a84b8c 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -18,7 +18,6 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cancelable_request.h"
-#include "chrome/browser/cld_helper.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
@@ -537,6 +536,9 @@ class TabContents : public PageNavigator,
     return last_search_result_;
   }
 
+  // Get the most probable language of the text content in the tab.
+  void GetPageLanguage();
+
   // Misc state & callbacks ----------------------------------------------------
 
   // Set whether the contents should block javascript message boxes or not.
@@ -810,9 +812,6 @@ class TabContents : public PageNavigator,
   virtual void OnDidGetApplicationInfo(
       int32 page_id,
       const webkit_glue::WebApplicationInfo& info);
-  virtual void OnPageContents(const GURL& url,
-                              int32 page_id,
-                              const std::wstring& contents);
 
   // RenderViewHostDelegate::Resource implementation.
   virtual void DidStartProvisionalLoadForFrame(RenderViewHost* render_view_host,
@@ -1177,9 +1176,6 @@ class TabContents : public PageNavigator,
   // profile
   scoped_refptr<URLRequestContextGetter> request_context_;
 
-  // Used to retrieve the language of the current page.
-  scoped_refptr<CLDHelper> cld_helper_;
-
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);