No chrome dependencies in TemplateURLFetcher and TemplateURLParser

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_fetcher.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.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/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.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"
 
@@ skipping 54 matching lines @@
   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) {
+    : content::WebContentsObserver(web_contents),
+      weak_ptr_factory_(this) {
   DCHECK(web_contents);
 }
 
 void SearchEngineTabHelper::OnPageHasOSDD(
     const GURL& page_url,
     const GURL& osdd_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.
@@ skipping 30 matching lines @@
   if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
     keyword = GenerateKeywordFromNavigationEntry(entry);
     if (keyword.empty())
       return;
   }
 
   // Download the OpenSearch description document. If this is successful, a
   // new keyword will be created when done.
   TemplateURLFetcherFactory::GetForProfile(profile)->ScheduleDownload(
       keyword, osdd_url, entry->GetFavicon().url, web_contents(),
-      new TemplateURLFetcherUICallbacks(this, web_contents()), provider_type);
+      base::Bind(&SearchEngineTabHelper::OnDownloadedOSDD,
+                 weak_ptr_factory_.GetWeakPtr()),
+      provider_type);
+}
+
+void SearchEngineTabHelper::OnDownloadedOSDD(
+    scoped_ptr<TemplateURL> template_url) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+  delegate_->ConfirmAddSearchProvider(template_url.release(), profile);

[Peter Kasting, 2014/07/07 22:48:44]

Bonus points if in some future change you make ConfirmAddSearchProvider() take a
scoped_ptr as its first arg instead of a raw pointer.

[hashimoto, 2014/07/08 00:19:36]

That should be nice.
I'll do it later.

 }
 
 void SearchEngineTabHelper::GenerateKeywordIfNecessary(
     const content::FrameNavigateParams& params) {
   if (!params.searchable_form_url.is_valid())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (profile->IsOffTheRecord())
@@ skipping 48 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(data));
 }