Remove content::URLFetcherDelegate

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string_util.h"
 #include "base/stringprintf.h"

[wtc, 2012/05/22 17:26:38]

On Linux, the "ls" command lists string_util.h after
stringprintf.h, even though '_' is before the lowercase
letters in the ASCII table.  Do you know why?  Just curious.

[akalin, 2012/05/22 21:07:05]

I don't -- that's curious.  Perhaps pre-existing tradition before ASCII? :)

-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/default_web_intent_service.h"
-#include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 52 matching lines @@
 
 class DummyURLFetcherFactory : public content::URLFetcherFactory {
  public:
    DummyURLFetcherFactory() {}
    virtual ~DummyURLFetcherFactory() {}
 
    virtual content::URLFetcher* CreateURLFetcher(
        int id,
        const GURL& url,
        content::URLFetcher::RequestType request_type,
-       content::URLFetcherDelegate* d) OVERRIDE {
+       net::URLFetcherDelegate* d) OVERRIDE {
      return new TestURLFetcher(id, url, d);
    }
 };
 
 }  // namespace
 
 class WebIntentPickerMock : public WebIntentPicker,
                             public WebIntentPickerModelObserver {
  public:
   WebIntentPickerMock()
@@ skipping 494 matching lines @@
 
   EXPECT_EQ(2, picker_.num_installed_services_);
 
   // The tab is shown immediately without needing to call OnServiceChosen.
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             browser()->GetSelectedWebContents()->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 }