Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

chrome/browser/component_updater/test/component_updater_service_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/component_updater/component_updater_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 227 matching lines @@
 // are generated.
 TEST_F(ComponentUpdaterTest, CheckCrxSleep) {
   MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   content::TestBrowserThread file_thread(BrowserThread::FILE);
   content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartIOThread();
   file_thread.Start();
 
-  scoped_refptr<ComponentUpdateInterceptor>
-      interceptor(new ComponentUpdateInterceptor());
+  ComponentUpdateInterceptor interceptor;
 
   CrxComponent com;
   RegisterComponent(&com, kTestComponent_abag, Version("1.1"));
 
   const char expected_update_url[] =
       "http://localhost/upd?extra=foo&x=id%3D"
       "abagagagagagagagagagagagagagagag%26v%3D1.1%26uc";
 
-  interceptor->SetResponse(expected_update_url,
-                           header_ok_reply,
-                           test_file("updatecheck_reply_1.xml"));
+  interceptor.SetResponse(expected_update_url,
+                          header_ok_reply,
+                          test_file("updatecheck_reply_1.xml"));
 
   // We loop twice, but there are no updates so we expect two sleep messages.
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
 
   ASSERT_EQ(1ul, notification_tracker().size());
   TestNotificationTracker::Event ev1 = notification_tracker().at(0);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_STARTED, ev1.type);
 
   message_loop.Run();
 
   ASSERT_EQ(3ul, notification_tracker().size());
   TestNotificationTracker::Event ev2 = notification_tracker().at(1);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev2.type);
   TestNotificationTracker::Event ev3 = notification_tracker().at(2);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev2.type);
-  EXPECT_EQ(2, interceptor->hit_count());
+  EXPECT_EQ(2, interceptor.GetHitCount());
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 
   // Loop twice again but this case we simulate a server error by returning
   // an empty file.
 
-  interceptor->SetResponse(expected_update_url,
-                           header_ok_reply,
-                           test_file("updatecheck_reply_empty"));
+  interceptor.SetResponse(expected_update_url,
+                          header_ok_reply,
+                          test_file("updatecheck_reply_empty"));
 
   notification_tracker().Reset();
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
 
   message_loop.Run();
 
   ASSERT_EQ(3ul, notification_tracker().size());
   ev1 = notification_tracker().at(0);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_STARTED, ev1.type);
   ev2 = notification_tracker().at(1);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev2.type);
   ev3 = notification_tracker().at(2);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev2.type);
-  EXPECT_EQ(4, interceptor->hit_count());
+  EXPECT_EQ(4, interceptor.GetHitCount());
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 }
 
 // Verify that we can check for updates and install one component. Besides
 // the notifications above NOTIFICATION_COMPONENT_UPDATE_FOUND and
 // NOTIFICATION_COMPONENT_UPDATE_READY should have been fired. We do two loops
 // so the second time around there should be nothing left to do.
 // We also check that only 3 network requests are issued:
 // 1- manifest check
 // 2- download crx
 // 3- second manifest check.
 TEST_F(ComponentUpdaterTest, InstallCrx) {
   MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   content::TestBrowserThread file_thread(BrowserThread::FILE);
   content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartIOThread();
   file_thread.Start();
 
-  scoped_refptr<ComponentUpdateInterceptor>
-      interceptor(new ComponentUpdateInterceptor());
+  ComponentUpdateInterceptor interceptor;
 
   CrxComponent com1;
   RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"));
   CrxComponent com2;
   RegisterComponent(&com2, kTestComponent_abag, Version("2.2"));
 
   const char expected_update_url_1[] =
       "http://localhost/upd?extra=foo&x=id%3D"
       "jebgalgnebhfojomionfpkfelancnnkf%26v%3D0.9%26uc&x=id%3D"
       "abagagagagagagagagagagagagagagag%26v%3D2.2%26uc";
 
   const char expected_update_url_2[] =
       "http://localhost/upd?extra=foo&x=id%3D"
       "abagagagagagagagagagagagagagagag%26v%3D2.2%26uc&x=id%3D"
       "jebgalgnebhfojomionfpkfelancnnkf%26v%3D1.0%26uc";
 
-  interceptor->SetResponse(expected_update_url_1, header_ok_reply,
-                           test_file("updatecheck_reply_1.xml"));
-  interceptor->SetResponse(expected_update_url_2, header_ok_reply,
-                           test_file("updatecheck_reply_1.xml"));
-  interceptor->SetResponse(expected_crx_url, header_ok_reply,
-                           test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
+  interceptor.SetResponse(expected_update_url_1, header_ok_reply,
+                          test_file("updatecheck_reply_1.xml"));
+  interceptor.SetResponse(expected_update_url_2, header_ok_reply,
+                          test_file("updatecheck_reply_1.xml"));
+  interceptor.SetResponse(expected_crx_url, header_ok_reply,
+                          test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   test_configurator()->SetLoopCount(2);
 
   component_updater()->Start();
   message_loop.Run();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
   EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
-  EXPECT_EQ(3, interceptor->hit_count());
+  EXPECT_EQ(3, interceptor.GetHitCount());
 
   ASSERT_EQ(5ul, notification_tracker().size());
 
   TestNotificationTracker::Event ev1 = notification_tracker().at(1);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND, ev1.type);
 
   TestNotificationTracker::Event ev2 = notification_tracker().at(2);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATE_READY, ev2.type);
 
   TestNotificationTracker::Event ev3 = notification_tracker().at(3);
@@ skipping 10 matching lines @@
 // version is much higher than of chrome.
 TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
   MessageLoop message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   content::TestBrowserThread file_thread(BrowserThread::FILE);
   content::TestBrowserThread io_thread(BrowserThread::IO);
 
   io_thread.StartIOThread();
   file_thread.Start();
 
-  scoped_refptr<ComponentUpdateInterceptor>
-      interceptor(new ComponentUpdateInterceptor());
+  ComponentUpdateInterceptor interceptor;
 
   CrxComponent com;
   RegisterComponent(&com, kTestComponent_jebg, Version("0.9"));
 
   const char expected_update_url[] =
       "http://localhost/upd?extra=foo&x=id%3D"
       "jebgalgnebhfojomionfpkfelancnnkf%26v%3D0.9%26uc";
 
-  interceptor->SetResponse(expected_update_url,
-                           header_ok_reply,
-                           test_file("updatecheck_reply_2.xml"));
-  interceptor->SetResponse(expected_crx_url, header_ok_reply,
-                           test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
+  interceptor.SetResponse(expected_update_url,
+                          header_ok_reply,
+                          test_file("updatecheck_reply_2.xml"));
+  interceptor.SetResponse(expected_crx_url, header_ok_reply,
+                          test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   message_loop.Run();
 
-  EXPECT_EQ(1, interceptor->hit_count());
+  EXPECT_EQ(1, interceptor.GetHitCount());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 }