Remove AddSearchProvider

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 "base/metrics/histogram_macros.h"
 #include "chrome/browser/profiles/profile.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/edit_search_engine_controller.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_fetcher.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/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 76 matching lines @@
   return handled;
 }
 
 bool SearchEngineTabHelper::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   return OnMessageReceived(message);
 }
 
 SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
-    : content::WebContentsObserver(web_contents),
-      delegate_(nullptr),
-      weak_ptr_factory_(this) {
+    : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
 void SearchEngineTabHelper::OnPageHasOSDD(
     const GURL& page_url,
-    const GURL& osdd_url,
-    const search_provider::OSDDType& msg_provider_type) {
+    const GURL& osdd_url) {
   // 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.
 
-  TemplateURLFetcher::ProviderType provider_type =
-      (msg_provider_type == search_provider::AUTODETECTED_PROVIDER)
-          ? TemplateURLFetcher::AUTODETECTED_PROVIDER
-          : TemplateURLFetcher::EXPLICIT_PROVIDER;
-
-  if (provider_type == TemplateURLFetcher::EXPLICIT_PROVIDER) {
-    UMA_HISTOGRAM_ENUMERATION(
-        "Search.AddSearchProvider2",
-        EditSearchEngineController::ADD_SEARCH_PROVIDER_CALLED,
-        EditSearchEngineController::NUM_EDIT_SEARCH_ENGINE_ACTIONS);
-  }
-
   // Make sure that the page is the current page and other basic checks.
   // When |page_url| has file: scheme, this method doesn't work because of
   // http://b/issue?id=863583. For that reason, this doesn't check and allow
   // urls referring to osdd urls with same schemes.
   if (!osdd_url.is_valid() || !osdd_url.SchemeIsHTTPOrHTTPS())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (page_url != web_contents()->GetLastCommittedURL() ||
       !TemplateURLFetcherFactory::GetForProfile(profile) ||
       profile->IsOffTheRecord())
     return;
 
   // If the current page is a form submit, find the last page that was not a
   // form submit and use its url to generate the keyword from.
   const NavigationController& controller = web_contents()->GetController();
   const NavigationEntry* entry = controller.GetLastCommittedEntry();
   for (int index = controller.GetLastCommittedEntryIndex();
        (index > 0) && IsFormSubmit(entry);
        entry = controller.GetEntryAtIndex(index))
     --index;
   if (!entry || IsFormSubmit(entry))
     return;
 
   // Autogenerate a keyword for the autodetected case; in the other cases we'll
   // generate a keyword later after fetching the OSDD.
-  base::string16 keyword;
-  if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
-    keyword = GenerateKeywordFromNavigationEntry(entry);
-    if (keyword.empty())
-      return;
-  }
+  base::string16 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,
-      base::Bind(&AssociateURLFetcherWithWebContents, web_contents()),
-      base::Bind(&SearchEngineTabHelper::OnDownloadedOSDD,
-                 weak_ptr_factory_.GetWeakPtr()),
-      provider_type);
-}
-
-void SearchEngineTabHelper::OnDownloadedOSDD(
-    std::unique_ptr<TemplateURL> template_url) {
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  delegate_->ConfirmAddSearchProvider(template_url.release(), profile);
+      base::Bind(&AssociateURLFetcherWithWebContents, web_contents()));
 }
 
 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));
 }