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

chrome/browser/ui/webui/options/import_data_handler.cc

Index: chrome/browser/ui/webui/options/import_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 5c5c339285f0b9bb04cf1c13e9ac5ba0eb04fec9..a425f836c0c6e0b21ebd7f388ec4a050077eebf1 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -18,7 +18,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
-#include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_type.h"
 #include "chrome/browser/profiles/profile.h"
@@ -65,8 +64,7 @@ void ImportDataHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
 }
 
 void ImportDataHandler::InitializeHandler() {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  importer_list_ = new ImporterList(profile->GetRequestContext());
+  importer_list_ = new ImporterList();
   importer_list_->DetectSourceProfiles(
       g_browser_process->GetApplicationLocale(), this);
 }
@@ -111,16 +109,8 @@ void ImportDataHandler::ImportData(const ListValue* args) {
                                      state);
     import_did_succeed_ = false;
 
-    // The Google Toolbar importer doesn't work for the out-of-process import.
-    // This is the only entry point for this importer (it is never used on first
-    // run). See discussion on http://crbug.com/219419 for details.
-    if (source_profile.importer_type == importer::TYPE_GOOGLE_TOOLBAR5)
-      importer_host_ = new ImporterHost;
-    else
-      importer_host_ = new ExternalProcessImporterHost;
+    importer_host_ = new ExternalProcessImporterHost;

[James Hawkins, 2013/06/28 03:08:15]

nit: Host();

[gab, 2013/06/28 04:23:16]

What do you mean? You want:
importer_host_ = new ExternalProcessImporterHost();
? (i.e., explicitly adding "()"?)

This is not how any of these are constructed across the codebase. Do we have a
style-guide rule enforcing either?

[James Hawkins, 2013/06/28 15:23:59]

Regardless of the rule, the code is currently internally inconsistent.  Line 67
includes the parentheses while this line does not.  Above all the style guide
requires files to be internally consistent. 

[gab, 2013/06/28 15:40:28]

Done.

     importer_host_->SetObserver(this);
-    importer_host_->set_browser(
-        chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
     Profile* profile = Profile::FromWebUI(web_ui());
     importer_host_->StartImportSettings(source_profile, profile,
                                         import_services,