Revert of Simplify BrowserContext by removing redundant methods.

android_webview/native/aw_contents_statics.cc

 // Copyright 2014 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 "android_webview/native/aw_contents_statics.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "jni/AwContentsStatics_jni.h"
 #include "net/cert/cert_database.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
 
 namespace android_webview {
@@ skipping 26 matching lines @@
       base::Bind(&NotifyClientCertificatesChanged),
       base::Bind(&ClientCertificatesCleared, base::Owned(j_callback)));
 }
 
 // static
 void SetDataReductionProxyKey(JNIEnv* env,
                               const JavaParamRef<jclass>&,
                               const JavaParamRef<jstring>& key) {
   AwBrowserContext* browser_context = AwBrowserContext::GetDefault();
   DCHECK(browser_context);
+  DCHECK(browser_context->GetRequestContext());
   // The following call to GetRequestContext() could possibly be the first such
   // call, which means AwURLRequestContextGetter::InitializeURLRequestContext
   // will be called on IO thread as a result.
   AwURLRequestContextGetter* aw_url_request_context_getter =
       static_cast<AwURLRequestContextGetter*>(
-          content::BrowserContext::GetDefaultStoragePartition(browser_context)->
-              GetURLRequestContext());
-  DCHECK(aw_url_request_context_getter);
+          browser_context->GetRequestContext());
 
   // This PostTask has to be called after GetRequestContext, because SetKeyOnIO
   // needs a valid DataReductionProxyRequestOptions object.
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&AwURLRequestContextGetter::SetKeyOnIO,
                                      aw_url_request_context_getter,
                                      ConvertJavaStringToUTF8(env, key)));
 }
 
@@ skipping 34 matching lines @@
   AwContentsIoThreadClientImpl::SetServiceWorkerIoThreadClient(
       io_thread_client, browser_context);
 }
 
 
 bool RegisterAwContentsStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview