Deprecate RegisterProtocolFactory/(Un)RegisterInterceptor.

webkit/fileapi/file_system_dir_url_request_job_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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
@@ skipping 18 matching lines @@
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 namespace fileapi {
 namespace {
 
 // We always use the TEMPORARY FileSystem in this test.
-static const char kFileSystemURLPrefix[] = "filesystem:http://remote/temporary/";
+static const char kFileSystemURLPrefix[] =
+    "filesystem:http://remote/temporary/";
 
 class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
  public:
   virtual bool IsStorageProtected(const GURL& origin) {
     return false;
   }
 
   virtual bool IsStorageUnlimited(const GURL& origin) {
     return true;
   }
 
   virtual bool IsFileHandler(const std::string& extension_id) {
     return true;
   }
 };
 
+}  // namespace
+
 class FileSystemDirURLRequestJobTest : public testing::Test {
  protected:
   FileSystemDirURLRequestJobTest()
     : message_loop_(MessageLoop::TYPE_IO),  // simulate an IO thread
       ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
@@ skipping 10 matching lines @@
             new FileSystemPathManager(
                     file_thread_proxy_, temp_dir_.path(),
                     NULL, false, false));
 
     file_system_context_->path_manager()->ValidateFileSystemRootAndGetURL(
         GURL("http://remote/"), kFileSystemTypeTemporary, true,  // create
         callback_factory_.NewCallback(
             &FileSystemDirURLRequestJobTest::OnGetRootPath));
     MessageLoop::current()->RunAllPending();
 
-    net::URLRequest::RegisterProtocolFactory(
+    net::URLRequest::Deprecated::RegisterProtocolFactory(
         "filesystem", &FileSystemDirURLRequestJobFactory);
   }
 
   virtual void TearDown() {
     // NOTE: order matters, request must die before delegate
     request_.reset(NULL);
     delegate_.reset(NULL);
 
-    net::URLRequest::RegisterProtocolFactory("filesystem", NULL);
+    net::URLRequest::Deprecated::RegisterProtocolFactory("filesystem", NULL);
   }
 
   void OnGetRootPath(bool success, const FilePath& root_path,
                      const std::string& name) {
     ASSERT_TRUE(success);
     root_path_ = root_path;
   }
 
   void TestRequestHelper(const GURL& url, bool run_to_completion) {
     delegate_.reset(new TestDelegate());
@@ skipping 60 matching lines @@
   scoped_refptr<TestSpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<FileSystemContext> file_system_context_;
   base::ScopedCallbackFactory<FileSystemDirURLRequestJobTest> callback_factory_;
 
   static net::URLRequestJob* job_;
 };
 
 // static
 net::URLRequestJob* FileSystemDirURLRequestJobTest::job_ = NULL;
 
+namespace {
+
 // TODO(adamk): Write tighter tests once we've decided on a format for directory
 // listing responses.
 TEST_F(FileSystemDirURLRequestJobTest, DirectoryListing) {
   CreateDirectory("foo");
   CreateDirectory("foo/bar");
   CreateDirectory("foo/bar/baz");
 
   TestRequest(CreateFileSystemURL("foo/bar/"));
 
   ASSERT_FALSE(request_->is_pending());
@@ skipping 38 matching lines @@
   MessageLoop::current()->PostTask(FROM_HERE, new QuitNowTask);
   MessageLoop::current()->Run();
 
   request_.reset();
   MessageLoop::current()->RunAllPending();
   // If we get here, success! we didn't crash!
 }
 
 }  // namespace (anonymous)
 }  // namespace fileapi