Remove Google Toolbar importer (aka google.com/bookmarks importer).

chrome/browser/importer/importer_list.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/importer/importer_list.h"
 
 #include "base/bind.h"
-#include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/shell_integration.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
@@ skipping 70 matching lines @@
   firefox->app_path = GetFirefoxInstallPathFromRegistry();
 #endif
   if (firefox->app_path.empty())
     firefox->app_path = app_path;
   firefox->services_supported = importer::HISTORY | importer::FAVORITES |
       importer::PASSWORDS | importer::SEARCH_ENGINES;
   firefox->locale = locale;
   profiles->push_back(firefox);
 }
 
-#if defined(OS_WIN)
-void DetectGoogleToolbarProfiles(
-    std::vector<importer::SourceProfile*>* profiles,
-    scoped_refptr<net::URLRequestContextGetter> request_context_getter) {
-  if (first_run::IsChromeFirstRun())
-    return;
-
-  importer::SourceProfile* google_toolbar = new importer::SourceProfile;
-  google_toolbar->importer_name =
-      l10n_util::GetStringUTF16(IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
-  google_toolbar->importer_type = importer::TYPE_GOOGLE_TOOLBAR5;
-  google_toolbar->source_path.clear();
-  google_toolbar->app_path.clear();
-  google_toolbar->services_supported = importer::FAVORITES;
-  google_toolbar->request_context_getter = request_context_getter;
-  profiles->push_back(google_toolbar);
-}
-#endif
-
 }  // namespace
 
-ImporterList::ImporterList(
-    net::URLRequestContextGetter* request_context_getter)
+ImporterList::ImporterList()
     : source_thread_id_(BrowserThread::UI),
       observer_(NULL),
       is_observed_(false),
       source_profiles_loaded_(false) {
- request_context_getter_ = make_scoped_refptr(request_context_getter);
 }
 
 void ImporterList::DetectSourceProfiles(
     const std::string& locale,
     importer::ImporterListObserver* observer) {
   DCHECK(observer);
   observer_ = observer;
   is_observed_ = true;
 
   bool res = BrowserThread::GetCurrentThreadIdentifier(&source_thread_id_);
@@ skipping 46 matching lines @@
   // The first run import will automatically take settings from the first
   // profile detected, which should be the user's current default.
 #if defined(OS_WIN)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
     DetectIEProfiles(&profiles);
   } else {
     DetectIEProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
-  // TODO(brg) : Current UI requires win_util.
-  DetectGoogleToolbarProfiles(&profiles, request_context_getter_);
 #elif defined(OS_MACOSX)
   if (ShellIntegration::IsFirefoxDefaultBrowser()) {
     DetectFirefoxProfiles(locale, &profiles);
     DetectSafariProfiles(&profiles);
   } else {
     DetectSafariProfiles(&profiles);
     DetectFirefoxProfiles(locale, &profiles);
   }
 #else
   DetectFirefoxProfiles(locale, &profiles);
@@ skipping 25 matching lines @@
   source_profiles_.assign(profiles.begin(), profiles.end());
   source_profiles_loaded_ = true;
   source_thread_id_ = BrowserThread::UI;
 
   observer_->OnSourceProfilesLoaded();
   observer_ = NULL;
 
   // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed.
   is_observed_ = false;
 }