Revert of Simplify BrowserContext by removing redundant methods.

android_webview/browser/aw_browser_context.cc

Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 3cd1128525fcd8513f4d0e7ee95ae2865ca447fc..d5252bd244746c99d3ee9727fb838b0b5664a800 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -259,11 +259,9 @@
   const FilePath guid_file_path =
       GetPath().Append(FILE_PATH_LITERAL("metrics_guid"));
 
-  AwMetricsServiceClient::GetInstance()->Initialize(
-      user_pref_service_.get(),
-      content::BrowserContext::GetDefaultStoragePartition(this)->
-          GetURLRequestContext(),
-      guid_file_path);
+  AwMetricsServiceClient::GetInstance()->Initialize(user_pref_service_.get(),
+                                                    GetRequestContext(),
+                                                    guid_file_path);
 }
 
 void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
@@ -350,16 +348,18 @@
   return false;
 }
 
+net::URLRequestContextGetter* AwBrowserContext::GetRequestContext() {
+  return GetDefaultStoragePartition(this)->GetURLRequestContext();
+}
+
 net::URLRequestContextGetter* AwBrowserContext::GetMediaRequestContext() {
-  return content::BrowserContext::GetDefaultStoragePartition(this)->
-      GetURLRequestContext();
+  return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
 AwBrowserContext::GetMediaRequestContextForRenderProcess(
     int renderer_child_id) {
-  return content::BrowserContext::GetDefaultStoragePartition(this)->
-      GetURLRequestContext();
+  return GetRequestContext();
 }
 
 net::URLRequestContextGetter*