Switch SearchEngineTabHelper to use WebContentsUserData.

chrome/browser/ui/search_engines/search_engine_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/ui/search_engines/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
+int SearchEngineTabHelper::kUserDataKey;
+
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
 bool IsFormSubmit(const NavigationEntry* entry) {
   return (content::PageTransitionStripQualifier(entry->GetTransitionType()) ==
           content::PAGE_TRANSITION_FORM_SUBMIT);
 }
 
 string16 GenerateKeywordFromNavigationEntry(const NavigationEntry* entry) {
   // Don't autogenerate keywords for pages that are the result of form
@@ skipping 17 matching lines @@
   // elements and update AutocompletePopup to look for keywords using the path.
   // See http://b/issue?id=863583.
   if (!url.SchemeIs(chrome::kHttpScheme) || (url.path().length() > 1))
     return string16();
 
   return TemplateURLService::GenerateKeyword(url);
 }
 
 }  // namespace
 
-SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
-  DCHECK(web_contents);
-}
-
 SearchEngineTabHelper::~SearchEngineTabHelper() {
 }
 
 void SearchEngineTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& params) {
   GenerateKeywordIfNecessary(params);
 }
 
 bool SearchEngineTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchEngineTabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageHasOSDD, OnPageHasOSDD)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
+SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {
+  DCHECK(web_contents);
+}
+
 void SearchEngineTabHelper::OnPageHasOSDD(
     int32 page_id,
     const GURL& doc_url,
     const search_provider::OSDDType& msg_provider_type) {
   // Checks to see if we should generate a keyword based on the OSDD, and if
   // necessary uses TemplateURLFetcher to download the OSDD and create a
   // keyword.
 
   // Make sure page_id is the current page and other basic checks.
   DCHECK(doc_url.is_valid());
@@ skipping 95 matching lines @@
   // the favicon url wasn't obtained before the load started. This assumes the
   // latter.
   // TODO(sky): Need a way to set the favicon that doesn't involve generating
   // its url.
   data.favicon_url = current_favicon.is_valid() ?
       current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(params.searchable_form_encoding);
   url_service->Add(new TemplateURL(profile, data));
 }