Remove content::URLFetcherDelegate

chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/public/common/url_fetcher.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
+#include "net/url_request/url_fetcher_delegate.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/glue/web_intent_service_data.h"
 
 namespace {
 
 const char kShareActionURL[] = "http://webintents.org/share";
@@ skipping 43 matching lines @@
     return l10n_util::GetStringUTF16(IDS_WEB_INTENTS_ACTION_PICK);
   else if (!action.compare(kSubscribeActionURL))
     return l10n_util::GetStringUTF16(IDS_WEB_INTENTS_ACTION_SUBSCRIBE);
   else if (!action.compare(kSaveActionURL))
     return l10n_util::GetStringUTF16(IDS_WEB_INTENTS_ACTION_SAVE);
   else
     return l10n_util::GetStringUTF16(IDS_INTENT_PICKER_CHOOSE_SERVICE);
 }
 
 // Self-deleting trampoline that forwards A URLFetcher response to a callback.
-class URLFetcherTrampoline : public content::URLFetcherDelegate {
+class URLFetcherTrampoline : public net::URLFetcherDelegate {
  public:
   typedef base::Callback<void(const net::URLFetcher* source)>
       ForwardingCallback;
 
   explicit URLFetcherTrampoline(const ForwardingCallback& callback);
   ~URLFetcherTrampoline();
 
-  // content::URLFetcherDelegate implementation.
+  // net::URLFetcherDelegate implementation.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
  private:
   // Fowarding callback from |OnURLFetchComplete|.
   ForwardingCallback callback_;
 };
 
 URLFetcherTrampoline::URLFetcherTrampoline(const ForwardingCallback& callback)
     : callback_(callback) {
 }
@@ skipping 566 matching lines @@
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(wrapper_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }