Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/importer/toolbar_importer.h

 // Copyright (c) 2011 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.
 
 // The functionality provided here allows the user to import their bookmarks
 // (favorites) from Google Toolbar.
 
 #ifndef CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/profile_writer.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 
 class ImporterBridge;
 class XmlReader;
 
 // Toolbar5Importer is a class which exposes the functionality needed to
 // communicate with the Google Toolbar v5 front-end, negotiate the download of
 // Toolbar bookmarks, parse them, and install them on the client.
 // Toolbar5Importer should not have StartImport called more than once. Futher
 // if StartImport is called, then the class must not be destroyed until it has
 // either completed or Toolbar5Importer->Cancel() has been called.
-class Toolbar5Importer : public URLFetcher::Delegate, public Importer {
+class Toolbar5Importer : public content::URLFetcherDelegate, public Importer {
  public:
   Toolbar5Importer();
 
   // Importer:
   // The importer view calls this method to begin the process. |items| should
   // only either be NONE or FAVORITES, since as of right now these are the only
   // items this importer supports.
   virtual void StartImport(const importer::SourceProfile& source_profile,
                            uint16 items,
                            ImporterBridge* bridge) OVERRIDE;
 
   // Importer view call this method when the user clicks the cancel button
   // in the tabbed options UI.  We need to post a message to our loop
   // to cancel network retrieval.
   virtual void Cancel();
 
-  // URLFetcher::Delegate method called back from the URLFetcher object.
-  virtual void OnURLFetchComplete(const URLFetcher* source,
-                                  const GURL& url,
-                                  const net::URLRequestStatus& status,
-                                  int response_code,
-                                  const net::ResponseCookies& cookies,
-                                  const std::string& data);
+  // content::URLFetcherDelegate method called back from the URLFetcher object.
+  virtual void OnURLFetchComplete(const URLFetcher* source);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(Toolbar5ImporterTest, BookmarkParse);
 
   virtual ~Toolbar5Importer();
 
   // Internal states of the toolbar importer.
   enum InternalStateEnum {
     NOT_USED = -1,
     INITIALIZED,
@@ skipping 92 matching lines @@
 
   // The fetchers need to be available to cancel the network call on user cancel
   // hence they are stored as member variables.
   URLFetcher* token_fetcher_;
   URLFetcher* data_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Toolbar5Importer);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_TOOLBAR_IMPORTER_H_