Remove implicit conversions from scoped_refptr to T* in android_webview/

This patch was generated by running the rewrite_scoped_refptr clang tool on an Android build. BUG=110610 Review URL: https://codereview.chromium.org/634583004 Cr-Commit-Position: refs/heads/master@{#298503}
Denger-Network · Oct 7, 2014 · 4cb42ab · 4cb42ab
1 parent 4c6917e
commit 4cb42ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
@@ -148,10 +148,10 @@ net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
   // content::StoragePartitionImplMap::Create(). This is not fixable
   // until http://crbug.com/159193. Until then, assert that the context
   // has already been allocated and just handle setting the protocol_handlers.
-  DCHECK(url_request_context_getter_);
+  DCHECK(url_request_context_getter_.get());
   url_request_context_getter_->SetHandlersAndInterceptors(
       protocol_handlers, request_interceptors.Pass());
-  return url_request_context_getter_;
+  return url_request_context_getter_.get();
 }
 
 net::URLRequestContextGetter*

diff --git a/android_webview/browser/deferred_gpu_command_service.cc b/android_webview/browser/deferred_gpu_command_service.cc
@@ -30,14 +30,14 @@ ScopedAllowGL::ScopedAllowGL() {
   DCHECK(!allow_gl.Get().Get());
   allow_gl.Get().Set(true);
 
-  if (g_service.Get())
+  if (g_service.Get().get())
     g_service.Get()->RunTasks();
 }
 
 ScopedAllowGL::~ScopedAllowGL() {
   allow_gl.Get().Set(false);
 
-  DeferredGpuCommandService* service = g_service.Get();
+  DeferredGpuCommandService* service = g_service.Get().get();
   if (service) {
     service->RunTasks();
     if (service->IdleQueueSize()) {
@@ -48,7 +48,7 @@ ScopedAllowGL::~ScopedAllowGL() {
 
 // static
 void DeferredGpuCommandService::SetInstance() {
-  if (!g_service.Get()) {
+  if (!g_service.Get().get()) {
     g_service.Get() = new DeferredGpuCommandService;
     content::SynchronousCompositor::SetGpuService(g_service.Get());
   }

diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
@@ -175,8 +175,8 @@ void HardwareRenderer::SetFrameData() {
   bool size_changed = frame_size != frame_size_;
   frame_size_ = frame_size;
 
-  if (!frame_provider_ || size_changed) {
-    if (delegated_layer_) {
+  if (!frame_provider_.get() || size_changed) {
+    if (delegated_layer_.get()) {
       delegated_layer_->RemoveFromParent();
     }
 

diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -247,7 +247,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
 
   main_http_factory_.reset(main_cache);
   url_request_context_->set_http_transaction_factory(main_cache);
-  url_request_context_->set_cookie_store(cookie_store_);
+  url_request_context_->set_cookie_store(cookie_store_.get());
 
   job_factory_ = CreateJobFactory(&protocol_handlers_,
                                   request_interceptors_.Pass());