Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

chrome/browser/printing/print_dialog_cloud_interative_uitest.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/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 148 matching lines @@
   class AutoQuitDelegate : public net::TestDelegate {
    public:
     AutoQuitDelegate() {}
 
     virtual void OnResponseCompleted(net::URLRequest* request) {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               MessageLoop::QuitClosure());
     }
   };
 
   virtual void SetUp() {

[mmenke, 2012/12/18 20:32:15]

nit:  While you're here, these two should be OVERRIDE

     TestController::GetInstance()->set_result(false);
     InProcessBrowserTest::SetUp();
   }
 
   virtual void TearDown() {
     if (handler_added_) {
-      net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
-      filter->RemoveHostnameHandler(scheme_, host_name_);
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(Unregister, scheme_, host_name_));
       handler_added_ = false;
       TestController::GetInstance()->set_delegate(NULL);
     }
     InProcessBrowserTest::TearDown();
   }
 
   // Normally this is something I would expect could go into SetUp(),
   // but there seems to be some timing or ordering related issue with
   // the test harness that made that flaky.  Calling this from the
   // individual test functions seems to fix that.
   void AddTestHandlers() {
     if (!handler_added_) {
-      net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
       GURL cloud_print_service_url =
           CloudPrintURL(browser()->profile()).
           GetCloudPrintServiceURL();
       scheme_ = cloud_print_service_url.scheme();
       host_name_ = cloud_print_service_url.host();
-      filter->AddHostnameHandler(scheme_, host_name_,
-                                 &PrintDialogCloudTest::Factory);
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(Register, scheme_, host_name_));
       handler_added_ = true;
 
       GURL cloud_print_dialog_url =
           CloudPrintURL(browser()->profile()).
           GetCloudPrintServiceDialogURL();
       TestController::GetInstance()->set_expected_url(cloud_print_dialog_url);
       TestController::GetInstance()->set_delegate(&delegate_);
     }
 
     CreateDialogForTest();
   }
 
   void CreateDialogForTest() {
     FilePath path_to_pdf =
         test_data_directory_.AppendASCII("printing/cloud_print_uitest.pdf");
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&internal_cloud_print_helpers::CreateDialogFullImpl,
                    browser()->profile(), browser()->window()->GetNativeWindow(),
                    path_to_pdf, string16(), string16(),
                    std::string("application/pdf"), false));
   }
 
+ private:
+  static void Register(const std::string& scheme,

[mmenke, 2012/12/18 20:32:15]

Think these names are a little too vague.  Just RegisterTestHandlers /
UnregisterTestHandlers would be fine, or maybe Add/Remove, to match the
underlying function names.

+                       const std::string& host_name) {
+    net::URLRequestFilter::GetInstance()->AddHostnameHandler(
+        scheme, host_name, &PrintDialogCloudTest::Factory);
+  }
+  static void Unregister(const std::string& scheme,
+                         const std::string& host_name) {
+    net::URLRequestFilter::GetInstance()->RemoveHostnameHandler(scheme,
+                                                                host_name);
+  }
+
   bool handler_added_;
   std::string scheme_;
   std::string host_name_;
   FilePath test_data_directory_;
   AutoQuitDelegate delegate_;
 };
 
 net::URLRequestJob* PrintDialogCloudTest::Factory(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
@@ skipping 37 matching lines @@
   BrowserWindow* window = browser()->window();
   ASSERT_TRUE(window);
   gfx::NativeWindow native_window = window->GetNativeWindow();
   ASSERT_TRUE(native_window);
   bool key_sent = ui_controls::SendKeyPress(native_window, ui::VKEY_ESCAPE,
                                             false, false, false, false);
   EXPECT_TRUE(key_sent);
   if (key_sent)
     tab_closed_observer.Wait();
 }