Remove ContentBrowserClient::CreateRequestContext & CreateRequestContextForStoragePartition.

blimp/engine/common/blimp_browser_context.h

 // Copyright 2015 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.
 
 #ifndef BLIMP_ENGINE_COMMON_BLIMP_BROWSER_CONTEXT_H_
 #define BLIMP_ENGINE_COMMON_BLIMP_BROWSER_CONTEXT_H_
 
 #include <memory>
 
 #include "base/files/file_path.h"
@@ skipping 33 matching lines @@
       const base::FilePath& partition_path,
       bool in_memory) override;
   content::ResourceContext* GetResourceContext() override;
   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
   content::BrowserPluginGuestManager* GetGuestManager() override;
   storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
   content::PushMessagingService* GetPushMessagingService() override;
   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
   content::PermissionManager* GetPermissionManager() override;
   content::BackgroundSyncController* GetBackgroundSyncController() override;
-
-  // The content of |protocol_handlers| is swapped into the returned instance.
-  // Caller should take a reference to the returned instance via scoped_refptr.
-  const scoped_refptr<BlimpURLRequestContextGetter>& CreateRequestContext(
+  net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors);
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
+  net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
+      const base::FilePath& partition_path,
+      bool in_memory,
+      content::ProtocolHandlerMap* protocol_handlers,
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
 
  private:
   // Performs initialization of the BlimpBrowserContext while IO is still
   // allowed on the current thread.
   void InitWhileIOAllowed();
 
   std::unique_ptr<BlimpResourceContext> resource_context_;
   bool ignore_certificate_errors_;
   std::unique_ptr<content::PermissionManager> permission_manager_;
   bool off_the_record_;
   net::NetLog* net_log_;
   base::FilePath path_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpBrowserContext);
 };
 
 }  // namespace engine
 }  // namespace blimp
 
 #endif  // BLIMP_ENGINE_COMMON_BLIMP_BROWSER_CONTEXT_H_