Call scoped_refptr<T>::get() rather than relying on implicit "operator T*"

webkit/browser/dom_storage/dom_storage_area_unittest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 140 matching lines @@
     EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
     ASSERT_TRUE(old_value.is_null());
 
     // Check that saving a value has still left us without a backing database.
     EXPECT_EQ(NULL, area->backing_.get());
     EXPECT_FALSE(file_util::PathExists(kExpectedOriginFilePath));
   }
 
   // This should set up a DomStorageArea that is correctly backed to disk.
   {
-    scoped_refptr<DomStorageArea> area(
-        new DomStorageArea(kOrigin,
-            temp_dir.path(),
-            new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+    scoped_refptr<DomStorageArea> area(new DomStorageArea(
+        kOrigin,
+        temp_dir.path(),
+        new MockDomStorageTaskRunner(base::MessageLoopProxy::current().get())));
 
     EXPECT_TRUE(area->backing_.get());
     DomStorageDatabase* database = static_cast<LocalStorageDatabaseAdapter*>(
         area->backing_.get())->db_.get();
     EXPECT_FALSE(database->IsOpen());
     EXPECT_FALSE(area->is_initial_import_done_);
 
     // Inject an in-memory db to speed up the test.
     // We will verify that something is written into the database but not
     // that a file is written to disk - DOMStorageDatabase unit tests cover
@@ skipping 23 matching lines @@
     area->backing_->ReadAllValues(&values);
     EXPECT_EQ(1u, values.size());
     EXPECT_EQ(kValue, values[kKey].string());
   }
 }
 
 TEST_F(DomStorageAreaTest, CommitTasks) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
-  scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kOrigin,
-          temp_dir.path(),
-          new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+  scoped_refptr<DomStorageArea> area(new DomStorageArea(
+      kOrigin,
+      temp_dir.path(),
+      new MockDomStorageTaskRunner(base::MessageLoopProxy::current().get())));
   // Inject an in-memory db to speed up the test.
   area->backing_.reset(new LocalStorageDatabaseAdapter());
 
   // Unrelated to commits, but while we're here, see that querying Length()
   // causes the backing database to be opened and presumably read from.
   EXPECT_FALSE(area->is_initial_import_done_);
   EXPECT_EQ(0u, area->Length());
   EXPECT_TRUE(area->is_initial_import_done_);
 
   ValuesMap values;
@@ skipping 54 matching lines @@
   values.clear();
   area->backing_->ReadAllValues(&values);
   EXPECT_EQ(2u, values.size());
   EXPECT_EQ(kValue, values[kKey].string());
   EXPECT_EQ(kValue2, values[kKey2].string());
 }
 
 TEST_F(DomStorageAreaTest, CommitChangesAtShutdown) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kOrigin,
-          temp_dir.path(),
-          new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+  scoped_refptr<DomStorageArea> area(new DomStorageArea(
+      kOrigin,
+      temp_dir.path(),
+      new MockDomStorageTaskRunner(base::MessageLoopProxy::current().get())));
 
   // Inject an in-memory db to speed up the test and also to verify
   // the final changes are commited in it's dtor.
   static_cast<LocalStorageDatabaseAdapter*>(area->backing_.get())->db_.reset(
       new VerifyChangesCommittedDatabase());
 
   ValuesMap values;
   NullableString16 old_value;
   EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
   EXPECT_TRUE(area->HasUncommittedChanges());
   area->backing_->ReadAllValues(&values);
   EXPECT_TRUE(values.empty());  // not committed yet
   area->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(area->HasOneRef());
   EXPECT_FALSE(area->backing_.get());
   // The VerifyChangesCommittedDatabase destructor verifies values
   // were committed.
 }
 
 TEST_F(DomStorageAreaTest, DeleteOrigin) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kOrigin,
-          temp_dir.path(),
-          new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+  scoped_refptr<DomStorageArea> area(new DomStorageArea(
+      kOrigin,
+      temp_dir.path(),
+      new MockDomStorageTaskRunner(base::MessageLoopProxy::current().get())));
 
   // This test puts files on disk.
   base::FilePath db_file_path = static_cast<LocalStorageDatabaseAdapter*>(
       area->backing_.get())->db_->file_path();
   base::FilePath db_journal_file_path =
       DomStorageDatabase::GetJournalFilePath(db_file_path);
 
   // Nothing bad should happen when invoked w/o any files on disk.
   area->DeleteOrigin();
   EXPECT_FALSE(file_util::PathExists(db_file_path));
@@ skipping 37 matching lines @@
   // was called, the file will linger until the shutdown time.
   EXPECT_TRUE(file_util::PathExists(db_file_path));
   area->Shutdown();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_FALSE(file_util::PathExists(db_file_path));
 }
 
 TEST_F(DomStorageAreaTest, PurgeMemory) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  scoped_refptr<DomStorageArea> area(
-      new DomStorageArea(kOrigin,
-          temp_dir.path(),
-          new MockDomStorageTaskRunner(base::MessageLoopProxy::current())));
+  scoped_refptr<DomStorageArea> area(new DomStorageArea(
+      kOrigin,
+      temp_dir.path(),
+      new MockDomStorageTaskRunner(base::MessageLoopProxy::current().get())));
 
   // Inject an in-memory db to speed up the test.
   area->backing_.reset(new LocalStorageDatabaseAdapter());
 
   // Unowned ptrs we use to verify that 'purge' has happened.
   DomStorageDatabase* original_backing =
       static_cast<LocalStorageDatabaseAdapter*>(
           area->backing_.get())->db_.get();
   DomStorageMap* original_map = area->map_.get();
 
@@ skipping 76 matching lines @@
   EXPECT_EQ(
       base::FilePath().AppendASCII("-journal"),
       DomStorageDatabase::GetJournalFilePath(base::FilePath()));
   EXPECT_EQ(
       base::FilePath().AppendASCII(".extensiononly-journal"),
       DomStorageDatabase::GetJournalFilePath(
           base::FilePath().AppendASCII(".extensiononly")));
 }
 
 }  // namespace dom_storage