Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*"

android_webview/browser/aw_browser_context.cc

 // 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.
 
 #include "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_quota_manager_bridge.h"
 #include "android_webview/browser/jni_dependency_factory.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
@@ skipping 43 matching lines @@
 }
 
 // static
 AwBrowserContext* AwBrowserContext::FromWebContents(
     content::WebContents* web_contents) {
   // This is safe; this is the only implementation of the browser context.
   return static_cast<AwBrowserContext*>(web_contents->GetBrowserContext());
 }
 
 void AwBrowserContext::InitializeBeforeThreadCreation() {
-  DCHECK(!url_request_context_getter_);
+  DCHECK(!url_request_context_getter_.get());
   url_request_context_getter_ = new AwURLRequestContextGetter(this);
 }
 
 void AwBrowserContext::PreMainMessageLoopRun() {
   visitedlink_master_.reset(
       new visitedlink::VisitedLinkMaster(this, this, false));
   visitedlink_master_->Init();
 }
 
 void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
   DCHECK(visitedlink_master_);
   visitedlink_master_->AddURLs(urls);
 }
 
 net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers) {
-  CHECK(url_request_context_getter_);
+  CHECK(url_request_context_getter_.get());
   url_request_context_getter_->SetProtocolHandlers(protocol_handlers);
   return url_request_context_getter_.get();
 }
 
 net::URLRequestContextGetter*
 AwBrowserContext::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory,
     content::ProtocolHandlerMap* protocol_handlers) {
-  CHECK(url_request_context_getter_);
+  CHECK(url_request_context_getter_.get());
   return url_request_context_getter_.get();
 }
 
 AwQuotaManagerBridge* AwBrowserContext::GetQuotaManagerBridge() {
   if (!quota_manager_bridge_) {
     quota_manager_bridge_.reset(
         native_factory_->CreateAwQuotaManagerBridge(this));
   }
   return quota_manager_bridge_.get();
 }
@@ skipping 50 matching lines @@
 
 net::URLRequestContextGetter*
 AwBrowserContext::GetMediaRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory) {
   return GetRequestContext();
 }
 
 content::ResourceContext* AwBrowserContext::GetResourceContext() {
   if (!resource_context_) {
-    CHECK(url_request_context_getter_);
-    resource_context_.reset(new AwResourceContext(
-        url_request_context_getter_.get()));
+    CHECK(url_request_context_getter_.get());
+    resource_context_.reset(
+        new AwResourceContext(url_request_context_getter_.get()));
   }
   return resource_context_.get();
 }
 
 content::DownloadManagerDelegate*
 AwBrowserContext::GetDownloadManagerDelegate() {
   return &download_manager_delegate_;
 }
 
 content::GeolocationPermissionContext*
 AwBrowserContext::GetGeolocationPermissionContext() {
-  if (!geolocation_permission_context_) {
+  if (!geolocation_permission_context_.get()) {
     geolocation_permission_context_ =
         native_factory_->CreateGeolocationPermission(this);
   }
-  return geolocation_permission_context_;
+  return geolocation_permission_context_.get();
 }
 
 content::SpeechRecognitionPreferences*
 AwBrowserContext::GetSpeechRecognitionPreferences() {
   // By default allows profanities in speech recognition if return NULL.
   return NULL;
 }
 
 quota::SpecialStoragePolicy* AwBrowserContext::GetSpecialStoragePolicy() {
   // TODO(boliu): Implement this so we are not relying on default behavior.
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void AwBrowserContext::RebuildTable(
     const scoped_refptr<URLEnumerator>& enumerator) {
   // Android WebView rebuilds from WebChromeClient.getVisitedHistory. The client
   // can change in the lifetime of this WebView and may not yet be set here.
   // Therefore this initialization path is not used.
   enumerator->OnComplete(true);
 }
 
 }  // namespace android_webview