Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

android_webview/native/aw_quota_manager_bridge_impl.cc

 // Copyright (c) 2013 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_quota_manager_bridge_impl.h"
 
 #include <set>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 128 matching lines @@
 void GetOriginsTask::DoneOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_callback_.Run(origin_, usage_, quota_);
 }
 
 }  // namespace
 
 
 // static
 jint GetDefaultNativeAwQuotaManagerBridge(JNIEnv* env, jclass clazz) {
-  content::ContentBrowserClient* browser_client =
-      content::GetContentClient()->browser();
-  DCHECK(browser_client);
-
-  AwContentBrowserClient* aw_browser_client =
-      AwContentBrowserClient::FromContentBrowserClient(browser_client);
-  AwBrowserContext* browser_context = aw_browser_client->GetAwBrowserContext();
-  DCHECK(browser_context);
+  AwBrowserContext* browser_context =
+      AwContentBrowserClient::GetAwBrowserContext();
 
   AwQuotaManagerBridgeImpl* bridge = static_cast<AwQuotaManagerBridgeImpl*>(
       browser_context->GetQuotaManagerBridge());
   DCHECK(bridge);
   return reinterpret_cast<jint>(bridge);
 }
 
 AwQuotaManagerBridgeImpl::AwQuotaManagerBridgeImpl(
     AwBrowserContext* browser_context)
     : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
@@ skipping 128 matching lines @@
 
   Java_AwQuotaManagerBridge_onGetUsageAndQuotaForOriginCallback(
       env, obj.obj(), jcallback_id, is_quota, usage, quota);
 }
 
 bool RegisterAwQuotaManagerBridge(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview