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

chrome/browser/importer/importer_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
 
 class GURL;
 struct IE7PasswordInfo;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
 
 namespace importer {
 struct URLKeywordInfo;
 }
 
-// TODO: remove this, see friend declaration in ImporterBridge.
-class Toolbar5Importer;
-
 namespace content {
 struct PasswordForm;
 }
 
 class ImporterBridge : public base::RefCountedThreadSafe<ImporterBridge> {
  public:
   ImporterBridge();
 
   virtual void AddBookmarks(
       const std::vector<ImportedBookmarkEntry>& bookmarks,
@@ skipping 37 matching lines @@
   virtual void NotifyEnded() = 0;
 
   // For InProcessImporters this calls l10n_util. For ExternalProcessImporters
   // this calls the set of strings we've ported over to the external process.
   // It's good to avoid having to create a separate ResourceBundle for the
   // external import process, since the importer only needs a few strings.
   virtual string16 GetLocalizedString(int message_id) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<ImporterBridge>;
-  // TODO: In order to run Toolbar5Importer OOP we need to cut this
-  // connection, but as an interim step we allow Toolbar5Import to break
-  // the abstraction here and assume import is in-process.
-  friend class Toolbar5Importer;
 
   virtual ~ImporterBridge();
 
   DISALLOW_COPY_AND_ASSIGN(ImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_