Move content::URLFetcher static functions to net::URLFetcher

chrome/browser/google/google_url_tracker_unittest.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/google/google_url_tracker.h"
 
 #include <set>
 #include <string>
 
 #include "base/message_loop.h"
+#include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
-#include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/common/url_fetcher.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_url_fetcher_factory.h"
+#include "net/url_request/url_fetcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TabContents;
 
 // TestNotificationObserver ---------------------------------------------------
 
 namespace {
 
 class TestNotificationObserver : public content::NotificationObserver {
  public:
@@ skipping 794 matching lines @@
   EXPECT_FALSE(observer_->notified());
 
   infobar4->Accept();
   EXPECT_TRUE(GetInfoBar(1) == NULL);
   EXPECT_TRUE(GetInfoBar(3) == NULL);
   EXPECT_TRUE(GetInfoBar(4) == NULL);
   EXPECT_EQ(GURL("http://www.google.co.jp/"), google_url());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
   EXPECT_TRUE(observer_->notified());
 }