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

chrome/browser/importer/toolbar_importer.cc

 // 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.
 
 #include "chrome/browser/importer/toolbar_importer.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/libxml_utils.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "grit/generated_resources.h"
 
 // Toolbar5Importer
 const char Toolbar5Importer::kXmlApiReplyXmlTag[] = "xml_api_reply";
 const char Toolbar5Importer::kBookmarksXmlTag[] = "bookmarks";
 const char Toolbar5Importer::kBookmarkXmlTag[] = "bookmark";
 const char Toolbar5Importer::kTitleXmlTag[] = "title";
 const char Toolbar5Importer::kUrlXmlTag[] = "url";
 const char Toolbar5Importer::kTimestampXmlTag[] = "timestamp";
 const char Toolbar5Importer::kLabelsXmlTag[] = "labels";
@@ skipping 59 matching lines @@
   // thread for synchronization.
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     EndImport();
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&Toolbar5Importer::Cancel, this));
   }
 }
 
-void Toolbar5Importer::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+void Toolbar5Importer::OnURLFetchComplete(const URLFetcher* source) {
   if (cancelled()) {
     EndImport();
     return;
   }
 
-  if (200 != response_code) {  // HTTP/Ok
+  if (200 != source->response_code()) {  // HTTP/Ok
     // Cancelling here will update the UI and bypass the rest of bookmark
     // import.
     EndImportBookmarks();
     return;
   }
 
+  std::string data;
+  CHECK(source->GetResponseAsString(&data));
   switch (state_) {
     case GET_AUTHORIZATION_TOKEN:
       GetBookmarkDataFromServer(data);
       break;
     case GET_BOOKMARKS:
       GetBookmarksFromServerDataResponse(data);
       break;
     default:
       NOTREACHED() << "Invalid state.";
       EndImportBookmarks();
@@ skipping 427 matching lines @@
 }
 
 void  Toolbar5Importer::AddBookmarksToChrome(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
     const string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
 }