Moved PrerenderInterceptor to chrome\browser\prerender

BUG=NONE
TEST=Everything builds.

Review URL: http://codereview.chromium.org/5633003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68700 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 20 insertions, 39 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index b6f04ae..22aecf3 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -22,8 +22,8 @@
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/passive_log_collector.h"
 #include "chrome/browser/net/predictor_api.h"
-#include "chrome/browser/net/prerender_interceptor.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prerender/prerender_interceptor.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/raw_host_resolver_proc.h"
 #include "chrome/common/net/url_fetcher.h"
@@ -338,8 +338,7 @@ void IOThread::Init() {
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePagePrerender)) {
-    prerender_interceptor_.reset(
-        new chrome_browser_net::PrerenderInterceptor());
+    prerender_interceptor_.reset(new PrerenderInterceptor());
   }
 }
 
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 3443af1..83d241f 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -21,12 +21,12 @@ class ChromeNetLog;
 class ChromeURLRequestContextGetter;
 class ListValue;
 class PrefService;
+class PrerenderInterceptor;
 class URLRequestContext;
 
 namespace chrome_browser_net {
 class ConnectInterceptor;
 class Predictor;
-class PrerenderInterceptor;
 }  // namespace chrome_browser_net
 
 namespace net {
@@ -156,8 +156,7 @@ class IOThread : public BrowserProcessSubThread {
   // down.
   chrome_browser_net::ConnectInterceptor* speculative_interceptor_;
   chrome_browser_net::Predictor* predictor_;
-  scoped_ptr<chrome_browser_net::PrerenderInterceptor>
-    prerender_interceptor_;
+  scoped_ptr<PrerenderInterceptor> prerender_interceptor_;
 
   // List of live ProxyScriptFetchers.
   ProxyScriptFetchers fetchers_;
diff --git a/chrome/browser/net/prerender_interceptor.cc b/chrome/browser/prerender/prerender_interceptor.cc
index 3cdb89a..831cfff 100644
--- a/chrome/browser/net/prerender_interceptor.cc
+++ b/chrome/browser/prerender/prerender_interceptor.cc
@@ -2,19 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/net/prerender_interceptor.h"
+#include "chrome/browser/prerender/prerender_interceptor.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 
-DISABLE_RUNNABLE_METHOD_REFCOUNT(chrome_browser_net::PrerenderInterceptor);
-
-namespace chrome_browser_net {
+DISABLE_RUNNABLE_METHOD_REFCOUNT(PrerenderInterceptor);
 
 PrerenderInterceptor::PrerenderInterceptor()
     : ALLOW_THIS_IN_INITIALIZER_LIST(
@@ -25,8 +24,8 @@ PrerenderInterceptor::PrerenderInterceptor()
 
 PrerenderInterceptor::PrerenderInterceptor(
     PrerenderInterceptorCallback* callback)
-    : callback_(callback) {
-  net::URLRequest::RegisterRequestInterceptor(this);
+  : callback_(callback) {
+    net::URLRequest::RegisterRequestInterceptor(this);
 }
 
 PrerenderInterceptor::~PrerenderInterceptor() {
@@ -39,7 +38,7 @@ net::URLRequestJob* PrerenderInterceptor::MaybeIntercept(
 }
 
 net::URLRequestJob* PrerenderInterceptor::MaybeInterceptResponse(
-    net::URLRequest* request) {
+  net::URLRequest* request) {
   // TODO(gavinp): unfortunately, we can't figure out the origin
   // of this request here on systems where the referrer is blocked by
   // configuration.
@@ -74,4 +73,3 @@ void PrerenderInterceptor::PrerenderDispatch(
   DVLOG(2) << "PrerenderDispatchOnUIThread: url=" << url;
 }
 
-}  // namespace chrome_browser_net
diff --git a/chrome/browser/net/prerender_interceptor.h b/chrome/browser/prerender/prerender_interceptor.h
index 18f3eec..8a0fe32 100644
--- a/chrome/browser/net/prerender_interceptor.h
+++ b/chrome/browser/prerender/prerender_interceptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_NET_PRERENDER_INTERCEPTOR_H_
-#define CHROME_BROWSER_NET_PRERENDER_INTERCEPTOR_H_
+#ifndef CHROME_BROWSER_PRERENDER_PRERENDER_INTERCEPTOR_H_
+#define CHROME_BROWSER_PRERENDER_PRERENDER_INTERCEPTOR_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -13,8 +13,6 @@
 
 class GURL;
 
-namespace chrome_browser_net {
-
 // The PrerenderInterceptor watches prefetch requests, and when
 // they are for type text/html, notifies the prerendering
 // system about the fetch so it may consider the URL.
@@ -23,7 +21,7 @@ class PrerenderInterceptor : public net::URLRequest::Interceptor {
   PrerenderInterceptor();
   virtual ~PrerenderInterceptor();
 
-  // net::URLRequest::Interceptor overrides.  We only care about
+  // URLRequest::Interceptor overrides.  We only care about
   // MaybeInterceptResponse, but must capture MaybeIntercept since
   // it is pure virtual.
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
@@ -47,7 +45,5 @@ class PrerenderInterceptor : public net::URLRequest::Interceptor {
   DISALLOW_COPY_AND_ASSIGN(PrerenderInterceptor);
 };
 
-}  // namespace chrome_browser_net
-
-#endif  // CHROME_BROWSER_NET_PRERENDER_INTERCEPTOR_H_
+#endif  // CHROME_BROWSER_PRERENDER_PRERENDER_INTERCEPTOR_H_
 
diff --git a/chrome/browser/net/prerender_interceptor_unittest.cc b/chrome/browser/prerender/prerender_interceptor_unittest.cc
index 761978d..189bde1d 100644
--- a/chrome/browser/net/prerender_interceptor_unittest.cc
+++ b/chrome/browser/prerender/prerender_interceptor_unittest.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/net/prerender_interceptor.h"
+#include "chrome/browser/prerender/prerender_interceptor.h"
 
 #include <string>
 
 #include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_ptr.h"
@@ -16,12 +15,9 @@
 #include "net/base/load_flags.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_unittest.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chrome_browser_net {
 
 class PrerenderInterceptorTest : public testing::Test {
- protected:
+ public:
   PrerenderInterceptorTest();
 
   void MakeTestUrl(const std::string& base);
@@ -31,7 +27,6 @@ class PrerenderInterceptorTest : public testing::Test {
   GURL gurl_;
   GURL last_intercepted_gurl_;
   scoped_ptr<net::URLRequest> req_;
-
  private:
   void SetLastInterceptedGurl(const GURL& url);
 
@@ -39,7 +34,6 @@ class PrerenderInterceptorTest : public testing::Test {
   MessageLoopForIO io_loop_;
   scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
   BrowserThread ui_thread_;
-  TestDelegate delegate_;
 };
 
 PrerenderInterceptorTest::PrerenderInterceptorTest()
@@ -63,15 +57,13 @@ void PrerenderInterceptorTest::SetUp() {
 
 void PrerenderInterceptorTest::MakeTestUrl(const std::string& base) {
   gurl_ = test_server_.GetURL(base);
-  req_.reset(new TestURLRequest(gurl_, &delegate_));
+  req_.reset(new TestURLRequest(gurl_, new TestDelegate()));
 }
 
 void PrerenderInterceptorTest::SetLastInterceptedGurl(const GURL& url) {
   last_intercepted_gurl_ = url;
 }
 
-namespace {
-
 TEST_F(PrerenderInterceptorTest, Interception) {
   MakeTestUrl("files/prerender/doc1.html");
   req_->set_load_flags(req_->load_flags() | net::LOAD_PREFETCH);
@@ -102,6 +94,3 @@ TEST_F(PrerenderInterceptorTest, WrongMimeType) {
   EXPECT_NE(gurl_, last_intercepted_gurl_);
 }
 
-}  // namespace
-
-}  // namespace chrome_browser_net
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 859d8a0..f62f4c9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1795,8 +1795,6 @@
         'browser/net/predictor_api.h',
         'browser/net/pref_proxy_config_service.cc',
         'browser/net/pref_proxy_config_service.h',
-        'browser/net/prerender_interceptor.cc',
-        'browser/net/prerender_interceptor.h',
         'browser/net/referrer.cc',
         'browser/net/referrer.h',
         'browser/net/resolve_proxy_msg_helper.cc',
@@ -2013,6 +2011,8 @@
         'browser/prefs/session_startup_pref.h',
         'browser/prerender/prerender_contents.cc',
         'browser/prerender/prerender_contents.h',
+        'browser/prerender/prerender_interceptor.cc',
+        'browser/prerender/prerender_interceptor.h',
         'browser/prerender/prerender_manager.cc',
         'browser/prerender/prerender_manager.h',
         'browser/printing/print_dialog_gtk.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a55ac94..a626e06 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1234,7 +1234,6 @@
         'browser/net/passive_log_collector_unittest.cc',
         'browser/net/predictor_unittest.cc',
         'browser/net/pref_proxy_config_service_unittest.cc',
-        'browser/net/prerender_interceptor_unittest.cc',
         'browser/net/resolve_proxy_msg_helper_unittest.cc',
         'browser/net/sqlite_persistent_cookie_store_unittest.cc',
         'browser/net/url_fixer_upper_unittest.cc',
@@ -1283,6 +1282,7 @@
         'browser/prefs/pref_set_observer_unittest.cc',
         'browser/prefs/pref_value_store_unittest.cc',
         'browser/prefs/session_startup_pref_unittest.cc',
+        'browser/prerender/prerender_interceptor_unittest.cc',
         'browser/printing/cloud_print/cloud_print_setup_source_unittest.cc',
         'browser/printing/print_dialog_cloud_unittest.cc',
         'browser/printing/print_job_unittest.cc',