content/ fixups for scoped_refptr operator T* removal.

BUG=110610
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/532833003

Cr-Commit-Position: refs/heads/master@{#293159}

chrome/browser/platform_util_win.cc

@@ -25,6 +25,7 @@
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
+#include "content/public/browser/utility_process_host_client.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"

content/browser/indexed_db/indexed_db_factory_impl.cc

@@ -276,7 +276,7 @@ void IndexedDBFactoryImpl::DeleteDatabase(
   }
 
   database_map_[unique_identifier] = database.get();
-  origin_dbs_.insert(std::make_pair(origin_url, database));
+  origin_dbs_.insert(std::make_pair(origin_url, database.get()));
   database->DeleteDatabase(callbacks);
   RemoveDatabaseFromMaps(unique_identifier);
   database = NULL;
@@ -482,7 +482,7 @@ void IndexedDBFactoryImpl::Open(const base::string16& name,
 
   if (!was_open && database->ConnectionCount() > 0) {
     database_map_[unique_identifier] = database.get();
-    origin_dbs_.insert(std::make_pair(origin_url, database));
+    origin_dbs_.insert(std::make_pair(origin_url, database.get()));
   }
 }
 

content/browser/renderer_host/media/video_capture_controller_unittest.cc

@@ -412,7 +412,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   }
   // ReserveOutputBuffer ought to fail now, because the pool is depleted.
   ASSERT_FALSE(device_->ReserveOutputBuffer(media::VideoFrame::I420,
-                                            capture_resolution));
+                                            capture_resolution).get());
 
   // The new client needs to be told of 3 buffers; the old clients only 2.
   EXPECT_CALL(*client_b_, DoBufferCreated(client_b_route_2)).Times(kPoolSize);
@@ -525,9 +525,9 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   // ReserveOutputBuffers ought to fail now regardless of buffer format, because
   // the pool is depleted.
   ASSERT_FALSE(device_->ReserveOutputBuffer(media::VideoFrame::I420,
-                                            capture_resolution));
+                                            capture_resolution).get());
   ASSERT_FALSE(device_->ReserveOutputBuffer(media::VideoFrame::NATIVE_TEXTURE,
-                                            gfx::Size(0, 0)));
+                                            gfx::Size(0, 0)).get());
   EXPECT_CALL(*client_b_, DoBufferReady(client_b_route_2)).Times(shm_buffers);
   EXPECT_CALL(*client_b_, DoMailboxBufferReady(client_b_route_2))
       .Times(mailbox_buffers);

content/browser/utility_process_host_impl.cc

@@ -86,8 +86,8 @@ class UtilitySandboxedProcessLauncherDelegate
 UtilityMainThreadFactoryFunction g_utility_main_thread_factory = NULL;
 
 UtilityProcessHost* UtilityProcessHost::Create(
-    UtilityProcessHostClient* client,
-    base::SequencedTaskRunner* client_task_runner) {
+    const scoped_refptr<UtilityProcessHostClient>& client,
+    const scoped_refptr<base::SequencedTaskRunner>& client_task_runner) {
   return new UtilityProcessHostImpl(client, client_task_runner);
 }
 
@@ -97,8 +97,8 @@ void UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
 }
 
 UtilityProcessHostImpl::UtilityProcessHostImpl(
-    UtilityProcessHostClient* client,
-    base::SequencedTaskRunner* client_task_runner)
+    const scoped_refptr<UtilityProcessHostClient>& client,
+    const scoped_refptr<base::SequencedTaskRunner>& client_task_runner)
     : client_(client),
       client_task_runner_(client_task_runner),
       is_batch_mode_(false),

content/browser/utility_process_host_impl.h

@@ -35,8 +35,9 @@ class CONTENT_EXPORT UtilityProcessHostImpl
   static void RegisterUtilityMainThreadFactory(
       UtilityMainThreadFactoryFunction create);
 
-  UtilityProcessHostImpl(UtilityProcessHostClient* client,
-                         base::SequencedTaskRunner* client_task_runner);
+  UtilityProcessHostImpl(
+      const scoped_refptr<UtilityProcessHostClient>& client,
+      const scoped_refptr<base::SequencedTaskRunner>& client_task_runner);
   virtual ~UtilityProcessHostImpl();
 
   // UtilityProcessHost implementation:

content/public/browser/utility_process_host.h

@@ -39,8 +39,8 @@ class UtilityProcessHost : public IPC::Sender,
   // |client_task_runner| is required if |client| is supplied and is the task
   // runner upon which |client| will be invoked.
   CONTENT_EXPORT static UtilityProcessHost* Create(
-      UtilityProcessHostClient* client,
-      base::SequencedTaskRunner* client_task_runner);
+      const scoped_refptr<UtilityProcessHostClient>& client,
+      const scoped_refptr<base::SequencedTaskRunner>& client_task_runner);
 
   virtual ~UtilityProcessHost() {}
 

content/renderer/media/webmediaplayer_impl.cc

@@ -171,7 +171,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   DCHECK(encrypted_media_support_);
 
   // Threaded compositing isn't enabled universally yet.
-  if (!compositor_task_runner_)
+  if (!compositor_task_runner_.get())
     compositor_task_runner_ = base::MessageLoopProxy::current();
 
   media_log_->AddEvent(