Deprecate RegisterProtocolFactory/(Un)RegisterInterceptor.

content/browser/child_process_security_policy_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/common/test_url_constants.h"
 #include "content/common/url_constants.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ChildProcessSecurityPolicyTest : public testing::Test {
  protected:
   // testing::Test
   virtual void SetUp() {
     // In the real world, "chrome:" is a handled scheme.
-    net::URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme,
-                                             &net::URLRequestTestJob::Factory);
+    RegisterProtocolFactory(chrome::kChromeUIScheme,
+                            &net::URLRequestTestJob::Factory);
   }
   virtual void TearDown() {
-    net::URLRequest::RegisterProtocolFactory(chrome::kChromeUIScheme, NULL);
+    RegisterProtocolFactory(chrome::kChromeUIScheme, NULL);
+  }
+
+  static net::URLRequest::ProtocolFactory* RegisterProtocolFactory(
+      const std::string& scheme,
+      net::URLRequest::ProtocolFactory* factory) {
+    return net::URLRequest::Deprecated::RegisterProtocolFactory(
+        scheme, factory);
   }
 };
 
 static int kRendererID = 42;
 static int kWorkerRendererID = kRendererID + 1;
 
 TEST_F(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
   ChildProcessSecurityPolicy* p = ChildProcessSecurityPolicy::GetInstance();
 
   EXPECT_TRUE(p->IsWebSafeScheme(chrome::kHttpScheme));
@@ skipping 126 matching lines @@
 
 TEST_F(ChildProcessSecurityPolicyTest, RegisterWebSafeSchemeTest) {
   ChildProcessSecurityPolicy* p = ChildProcessSecurityPolicy::GetInstance();
 
   p->Add(kRendererID);
 
   // Currently, "asdf" is destined for ShellExecute, so it is allowed.
   EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
 
   // Once we register a ProtocolFactory for "asdf", we default to deny.
-  net::URLRequest::RegisterProtocolFactory("asdf",
+  RegisterProtocolFactory("asdf",
                                            &net::URLRequestTestJob::Factory);

[eroman, 2011/07/18 22:24:03]

indentation.

   EXPECT_FALSE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
 
   // We can allow new schemes by adding them to the whitelist.
   p->RegisterWebSafeScheme("asdf");
   EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
 
   // Cleanup.
-  net::URLRequest::RegisterProtocolFactory("asdf", NULL);
+  RegisterProtocolFactory("asdf", NULL);
   EXPECT_TRUE(p->CanRequestURL(kRendererID, GURL("asdf:rockers")));
 
   p->Remove(kRendererID);
 }
 
 TEST_F(ChildProcessSecurityPolicyTest, CanServiceCommandsTest) {
   ChildProcessSecurityPolicy* p = ChildProcessSecurityPolicy::GetInstance();
 
   p->Add(kRendererID);
 
@@ skipping 233 matching lines @@
 
   // Renderers are added and removed on the UI thread, but the policy can be
   // queried on the IO thread.  The ChildProcessSecurityPolicy needs to be
   // prepared to answer policy questions about renderers who no longer exist.
 
   // In this case, we default to secure behavior.
   EXPECT_FALSE(p->CanRequestURL(kRendererID, url));
   EXPECT_FALSE(p->CanReadFile(kRendererID, file));
   EXPECT_FALSE(p->HasWebUIBindings(kRendererID));
 }