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

webkit/browser/database/database_tracker_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/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 178 matching lines @@
 class DatabaseTracker_TestHelper_Test {
  public:
   static void TestDeleteOpenDatabase(bool incognito_mode) {
     // Initialize the tracker database.
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
         new quota::MockSpecialStoragePolicy;
     special_storage_policy->AddProtected(GURL(kOrigin2Url));
     scoped_refptr<DatabaseTracker> tracker(
-        new DatabaseTracker(temp_dir.path(), incognito_mode,
-                            special_storage_policy, NULL, NULL));
+        new DatabaseTracker(temp_dir.path(),
+                            incognito_mode,
+                            special_storage_policy.get(),
+                            NULL,
+                            NULL));
 
     // Create and open three databases.
     int64 database_size = 0;
     const base::string16 kOrigin1 =
         webkit_base::GetOriginIdentifierFromURL(GURL(kOrigin1Url));
     const base::string16 kOrigin2 =
         webkit_base::GetOriginIdentifierFromURL(GURL(kOrigin2Url));
     const base::string16 kDB1 = ASCIIToUTF16("db1");
     const base::string16 kDB2 = ASCIIToUTF16("db2");
     const base::string16 kDB3 = ASCIIToUTF16("db3");
@@ skipping 83 matching lines @@
   }
 
   static void TestDatabaseTracker(bool incognito_mode) {
     // Initialize the tracker database.
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
         new quota::MockSpecialStoragePolicy;
     special_storage_policy->AddProtected(GURL(kOrigin2Url));
     scoped_refptr<DatabaseTracker> tracker(
-        new DatabaseTracker(temp_dir.path(), incognito_mode,
-                            special_storage_policy, NULL, NULL));
+        new DatabaseTracker(temp_dir.path(),
+                            incognito_mode,
+                            special_storage_policy.get(),
+                            NULL,
+                            NULL));
 
     // Add two observers.
     TestObserver observer1;
     TestObserver observer2;
     tracker->AddObserver(&observer1);
     tracker->AddObserver(&observer2);
 
     // Open three new databases.
     int64 database_size = 0;
     const base::string16 kOrigin1 =
@@ skipping 129 matching lines @@
     const base::string16 kName = ASCIIToUTF16("name");
     const base::string16 kDescription = ASCIIToUTF16("description");
 
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     // Initialize the tracker with a QuotaManagerProxy
     scoped_refptr<TestQuotaManagerProxy> test_quota_proxy(
         new TestQuotaManagerProxy);
     scoped_refptr<DatabaseTracker> tracker(
-        new DatabaseTracker(temp_dir.path(), false /* incognito */,
-                            NULL, test_quota_proxy, NULL));
+        new DatabaseTracker(temp_dir.path(),
+                            false /* incognito */,
+                            NULL,
+                            test_quota_proxy.get(),
+                            NULL));
     EXPECT_TRUE(test_quota_proxy->registered_client_);
 
     // Create a database and modify it a couple of times, close it,
     // then delete it. Observe the tracker notifies accordingly.
 
     int64 database_size = 0;
     tracker->DatabaseOpened(kOriginId, kName, kDescription, 0,
                             &database_size);
     EXPECT_TRUE(test_quota_proxy->WasAccessNotified(kOrigin));
     test_quota_proxy->reset();
@@ skipping 80 matching lines @@
     base::MessageLoop message_loop;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath origin1_db_dir;
     base::FilePath origin2_db_dir;
     {
       scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
           new quota::MockSpecialStoragePolicy;
       special_storage_policy->AddSessionOnly(GURL(kOrigin2Url));
       scoped_refptr<DatabaseTracker> tracker(
-          new DatabaseTracker(
-              temp_dir.path(), false, special_storage_policy, NULL,
-              base::MessageLoopProxy::current()));
+          new DatabaseTracker(temp_dir.path(),
+                              false,
+                              special_storage_policy.get(),
+                              NULL,
+                              base::MessageLoopProxy::current()));
 
       // Open two new databases.
       tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0,
                               &database_size);
       EXPECT_EQ(0, database_size);
       tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0,
                               &database_size);
       EXPECT_EQ(0, database_size);
 
       // Write some data to each file.
@@ skipping 55 matching lines @@
     base::MessageLoop message_loop;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath origin1_db_dir;
     base::FilePath origin2_db_dir;
     {
       scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
           new quota::MockSpecialStoragePolicy;
       special_storage_policy->AddSessionOnly(GURL(kOrigin2Url));
       scoped_refptr<DatabaseTracker> tracker(
-          new DatabaseTracker(
-              temp_dir.path(), false, special_storage_policy, NULL,
-              base::MessageLoopProxy::current()));
+          new DatabaseTracker(temp_dir.path(),
+                              false,
+                              special_storage_policy.get(),
+                              NULL,
+                              base::MessageLoopProxy::current()));
       tracker->SetForceKeepSessionState();
 
       // Open two new databases.
       tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0,
                               &database_size);
       EXPECT_EQ(0, database_size);
       tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0,
                               &database_size);
       EXPECT_EQ(0, database_size);
 
@@ skipping 198 matching lines @@
 
 TEST(DatabaseTrackerTest, EmptyDatabaseNameIsValid) {
   DatabaseTracker_TestHelper_Test::EmptyDatabaseNameIsValid();
 }
 
 TEST(DatabaseTrackerTest, HandleSqliteError) {
   DatabaseTracker_TestHelper_Test::HandleSqliteError();
 }
 
 }  // namespace webkit_database