Revert 212459 "Remove TextDatabase from the history service."

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

 // Copyright (c) 2012 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/history/history_tab_helper.h"
 
 #include <utility>
 
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 63 matching lines @@
     // they saw in the URL bar, so we add the virtual URL as a redirect.  This
     // only applies to the main frame, as the virtual URL doesn't apply to
     // sub-frames.
     add_page_args.url = virtual_url;
     if (!add_page_args.redirects.empty())
       add_page_args.redirects.back() = virtual_url;
   }
   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) {
   // Allow the new page to set the title again.
   received_page_title_ = false;
 }
 
 void HistoryTabHelper::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
@@ skipping 43 matching lines @@
 
   if (received_page_title_)
     return;
 
   if (title->first) {
     UpdateHistoryPageTitle(*title->first);
     received_page_title_ = title->second;
   }
 }
 
+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());
   if (profile->IsOffTheRecord())
     return NULL;
 
   return HistoryServiceFactory::GetForProfile(profile,
                                               Profile::IMPLICIT_ACCESS);
 }
 
@@ skipping 11 matching lines @@
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
   if (hs) {
     NavigationEntry* entry = tab->GetController().GetLastCommittedEntry();
     if (entry) {
       hs->UpdateWithPageEndTime(tab, entry->GetPageID(), tab->GetURL(),
                                 base::Time::Now());
     }
   }
 }