Revert of Simplify BrowserContext by removing redundant methods.

content/public/browser/browser_context.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 #define CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 81 matching lines @@
       const GURL& site,
       const base::Closure& on_gc_required);
 
   // This function clears the contents of |active_paths| but does not take
   // ownership of the pointer.
   static void GarbageCollectStoragePartitions(
       BrowserContext* browser_context,
       std::unique_ptr<base::hash_set<base::FilePath>> active_paths,
       const base::Closure& done);
 
+  // DON'T USE THIS. GetDefaultStoragePartition() is going away.
+  // Use GetStoragePartition() instead. Ask ajwong@ if you have problems.
   static content::StoragePartition* GetDefaultStoragePartition(
       BrowserContext* browser_context);
 
   typedef base::Callback<void(std::unique_ptr<BlobHandle>)> BlobCallback;
 
   // |callback| returns a nullptr scoped_ptr on failure.
   static void CreateMemoryBackedBlob(BrowserContext* browser_context,
                                      const char* data, size_t length,
                                      const BlobCallback& callback);
 
@@ skipping 45 matching lines @@
   // This is called during creation of each StoragePartition.
   virtual std::unique_ptr<ZoomLevelDelegate> CreateZoomLevelDelegate(
       const base::FilePath& partition_path) = 0;
 
   // Returns the path of the directory where this context's data is stored.
   virtual base::FilePath GetPath() const = 0;
 
   // Return whether this context is incognito. Default is false.
   virtual bool IsOffTheRecord() const = 0;
 
+  // Returns the request context information associated with this context.  Call
+  // this only on the UI thread, since it can send notifications that should
+  // happen on the UI thread.
+  // TODO(creis): Remove this version in favor of the one below.
+  virtual net::URLRequestContextGetter* GetRequestContext() = 0;
+
   // Returns the default request context for media resources associated with
   // this context.
   // TODO(creis): Remove this version in favor of the one below.
   virtual net::URLRequestContextGetter* GetMediaRequestContext() = 0;
 
   // Returns the request context for media resources associated with this
   // context and renderer process.
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
       int renderer_child_id) = 0;
   virtual net::URLRequestContextGetter*
@@ skipping 42 matching lines @@
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       ProtocolHandlerMap* protocol_handlers,
       URLRequestInterceptorScopedVector request_interceptors) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_