Revert 212459 "Remove TextDatabase from the history service."

trunk/src/chrome/browser/history/history_tab_helper.cc

Index: trunk/src/chrome/browser/history/history_tab_helper.cc
===================================================================
--- trunk/src/chrome/browser/history/history_tab_helper.cc	(revision 212472)
+++ trunk/src/chrome/browser/history/history_tab_helper.cc	(working copy)
@@ -81,6 +81,16 @@
   return add_page_args;
 }
 
+bool HistoryTabHelper::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(HistoryTabHelper, message)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageContents, OnPageContents)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
 void HistoryTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
@@ -144,6 +154,26 @@
   }
 }
 
+void HistoryTabHelper::OnPageContents(const GURL& url,
+                                      int32 page_id,
+                                      const string16& 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).
+  // TODO(zelidrag) bug chromium-os:2808 - figure out if we want to reenable
+  // content indexing for chromeos in some future releases.
+#if !defined(OS_CHROMEOS)
+  if (!url.SchemeIsSecure()) {
+    HistoryService* hs = GetHistoryService();
+    if (hs)
+      hs->SetPageContents(url, contents);
+  }
+#endif
+}
+
 HistoryService* HistoryTabHelper::GetHistoryService() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());