Revert 35735 - Relanding the language detection code....

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 35751)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -369,9 +369,6 @@
     UMA_HISTOGRAM_TIMES("Tab.Close",
         base::TimeTicks::Now() - tab_close_start_time_);
   }
-
-  if (cld_helper_.get())
-    cld_helper_->CancelLanguageDetection();
 }
 
 // static
@@ -640,24 +637,6 @@
     delegate_->ActivateContents(this);
 }
 
-void TabContents::PageLanguageDetected() {
-  DCHECK(cld_helper_.get());
-
-  NavigationEntry* entry = controller_.GetActiveEntry();
-  if (process()->id() == cld_helper_->renderer_process_id() &&
-      entry && entry->page_id() == cld_helper_->page_id()) {
-    entry->set_language(cld_helper_->language());
-  }
-
-  std::string lang = cld_helper_->language();
-  NotificationService::current()->Notify(
-      NotificationType::TAB_LANGUAGE_DETERMINED,
-      Source<RenderViewHost>(render_view_host()),
-      Details<std::string>(&lang));
-
-  cld_helper_ = NULL;  // Release the CLD helper.
-}
-
 void TabContents::ShowContents() {
   if (render_widget_host_view())
     render_widget_host_view()->DidBecomeSelected();
@@ -1097,6 +1076,10 @@
   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())) {
@@ -1752,38 +1735,6 @@
     delegate()->OnDidGetApplicationInfo(this, page_id);
 }
 
-void TabContents::OnPageContents(const GURL& url,
-                                 int renderer_process_id,
-                                 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()) {
-      HistoryService* hs = p->GetHistoryService(Profile::IMPLICIT_ACCESS);
-      if (hs)
-        hs->SetPageContents(url, contents);
-    }
-  }
-
-  // Detect the page language.  The detection happens on the file thread.
-  // PageLanguageDetected() is called when the language has been detected.
-  if (cld_helper_.get()) {
-    // There is already a language detection in flight, cancel it to avoid
-    // having multiple PageLanguageDetected() notifications on this tab. (They
-    // would cause a crasher as cld_helper_ would be NULLed on the 1st
-    // notification).
-    cld_helper_->CancelLanguageDetection();
-  }
-  cld_helper_ = new CLDHelper(this, renderer_process_id, page_id, contents);
-  cld_helper_->DetectLanguage();
-}
-
 void TabContents::DidStartProvisionalLoadForFrame(
     RenderViewHost* render_view_host,
     bool is_main_frame,