Remove implicit conversions from scoped_refptr to T* in components/nacl/

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
 
 namespace nacl {
 namespace {
 
 // The pseudo-architecture used to indicate portable native client.
 const char* const kPortableArch = "portable";
 
 // The base URL for resources used by the PNaCl translator processes.
 const char* kPNaClTranslatorBaseUrl = "chrome://pnacl-translator/";
 
 base::LazyInstance<scoped_refptr<PnaclTranslationResourceHost> >

[Mark Seaborn, 2014/08/26 18:31:52]

As an aside, this use of base::LazyInstance<scoped_refptr<T>> surprised me.  It
seems convoluted (hence x.Get().get() later), but this pattern seems to be used
in various places in Chromium.

     g_pnacl_resource_host = LAZY_INSTANCE_INITIALIZER;
 
 bool InitializePnaclResourceHost() {
   // Must run on the main thread.
   content::RenderThread* render_thread = content::RenderThread::Get();
   if (!render_thread)
     return false;
-  if (!g_pnacl_resource_host.Get()) {
+  if (!g_pnacl_resource_host.Get().get()) {
     g_pnacl_resource_host.Get() = new PnaclTranslationResourceHost(
         render_thread->GetIOMessageLoopProxy());
-    render_thread->AddFilter(g_pnacl_resource_host.Get());
+    render_thread->AddFilter(g_pnacl_resource_host.Get().get());
   }
   return true;
 }
 
 struct InstanceInfo {
   InstanceInfo() : plugin_pid(base::kNullProcessId), plugin_child_id(0) {}
   GURL url;
   ppapi::PpapiPermissions permissions;
   base::ProcessId plugin_pid;
   int plugin_child_id;
@@ skipping 558 matching lines @@
       HistogramTimeTranslation("NaCl.Perf.PNaClLoadTime.TotalUncachedTime",
                                total_time.InMilliseconds());
       HistogramKBPerSec("NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec",
                         pexe_size / 1024,
                         total_time.InMicroseconds());
     }
   }
 
   // If the resource host isn't initialized, don't try to do that here.
   // Just return because something is already very wrong.
-  if (g_pnacl_resource_host.Get() == NULL)
+  if (g_pnacl_resource_host.Get().get() == NULL)
     return;
   g_pnacl_resource_host.Get()->ReportTranslationFinished(instance, success);
 }
 
 PP_FileHandle OpenNaClExecutable(PP_Instance instance,
                                  const char* file_url,
                                  uint64_t* nonce_lo,
                                  uint64_t* nonce_hi) {
   // Fast path only works for installed file URLs.
   GURL gurl(file_url);
@@ skipping 1034 matching lines @@
   &StreamPexe
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl