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

webkit/dom_storage/dom_storage_cached_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 <list>
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/dom_storage/dom_storage_cached_area.h"
@@ skipping 134 matching lines @@
     cached_area->Reset();
   }
 
  protected:
   scoped_refptr<MockProxy> mock_proxy_;
 };
 
 TEST_F(DomStorageCachedAreaTest, Basics) {
   EXPECT_TRUE(mock_proxy_->HasOneRef());
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
   EXPECT_EQ(kNamespaceId, cached_area->namespace_id());
   EXPECT_EQ(kOrigin, cached_area->origin());
   EXPECT_FALSE(mock_proxy_->HasOneRef());
   cached_area->ApplyMutation(NullableString16(kKey, false),
                              NullableString16(kValue, false));
-  EXPECT_FALSE(IsPrimed(cached_area));
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
 
-  ResetAll(cached_area);
+  ResetAll(cached_area.get());
   EXPECT_EQ(kNamespaceId, cached_area->namespace_id());
   EXPECT_EQ(kOrigin, cached_area->origin());
 
   const int kConnectionId = 1;
   EXPECT_EQ(0u, cached_area->GetLength(kConnectionId));
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
   EXPECT_EQ(1u, cached_area->GetLength(kConnectionId));
   EXPECT_EQ(kKey, cached_area->GetKey(kConnectionId, 0).string());
   EXPECT_EQ(kValue, cached_area->GetItem(kConnectionId, kKey).string());
   cached_area->RemoveItem(kConnectionId, kKey, kPageUrl);
   EXPECT_EQ(0u, cached_area->GetLength(kConnectionId));
 }
 
 TEST_F(DomStorageCachedAreaTest, Getters) {
   const int kConnectionId = 7;
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
 
   // GetLength, we expect to see one call to load in the proxy.
-  EXPECT_FALSE(IsPrimed(cached_area));
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   EXPECT_EQ(0u, cached_area->GetLength(kConnectionId));
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size());
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
   mock_proxy_->CompleteAllPendingCallbacks();
-  EXPECT_FALSE(IsIgnoringAllMutations(cached_area));
+  EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get()));
 
   // GetKey, expect the one call to load.
-  ResetAll(cached_area);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  ResetAll(cached_area.get());
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(cached_area->GetKey(kConnectionId, 2).is_null());
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size());
 
   // GetItem, ditto.
-  ResetAll(cached_area);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  ResetAll(cached_area.get());
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(cached_area->GetItem(kConnectionId, kKey).is_null());
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size());
 }
 
 TEST_F(DomStorageCachedAreaTest, Setters) {
   const int kConnectionId = 7;
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
 
   // SetItem, we expect a call to load followed by a call to set item
   // in the proxy.
-  EXPECT_FALSE(IsPrimed(cached_area));
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_TRUE(mock_proxy_->observed_set_item_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(kPageUrl, mock_proxy_->observed_page_url_);
   EXPECT_EQ(kKey, mock_proxy_->observed_key_);
   EXPECT_EQ(kValue, mock_proxy_->observed_value_);
   EXPECT_EQ(2u, mock_proxy_->pending_callbacks_.size());
 
   // Clear, we expect a just the one call to clear in the proxy since
   // there's no need to load the data prior to deleting it.
-  ResetAll(cached_area);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  ResetAll(cached_area.get());
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   cached_area->Clear(kConnectionId, kPageUrl);
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_clear_area_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(kPageUrl, mock_proxy_->observed_page_url_);
   EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size());
 
   // RemoveItem with nothing to remove, expect just one call to load.
-  ResetAll(cached_area);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  ResetAll(cached_area.get());
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   cached_area->RemoveItem(kConnectionId, kKey, kPageUrl);
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_FALSE(mock_proxy_->observed_remove_item_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(1u, mock_proxy_->pending_callbacks_.size());
 
   // RemoveItem with something to remove, expect a call to load followed
   // by a call to remove.
-  ResetAll(cached_area);
+  ResetAll(cached_area.get());
   mock_proxy_->load_area_return_values_[kKey] = NullableString16(kValue, false);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
   cached_area->RemoveItem(kConnectionId, kKey, kPageUrl);
-  EXPECT_TRUE(IsPrimed(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
   EXPECT_TRUE(mock_proxy_->observed_load_area_);
   EXPECT_TRUE(mock_proxy_->observed_remove_item_);
   EXPECT_EQ(kConnectionId, mock_proxy_->observed_connection_id_);
   EXPECT_EQ(kPageUrl, mock_proxy_->observed_page_url_);
   EXPECT_EQ(kKey, mock_proxy_->observed_key_);
   EXPECT_EQ(2u, mock_proxy_->pending_callbacks_.size());
 }
 
 TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilLoadCompletion) {
   const int kConnectionId = 7;
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
   EXPECT_TRUE(cached_area->GetItem(kConnectionId, kKey).is_null());
-  EXPECT_TRUE(IsPrimed(cached_area));
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsPrimed(cached_area.get()));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
 
   // Before load completion, the mutation should be ignored.
   cached_area->ApplyMutation(NullableString16(kKey, false),
                              NullableString16(kValue, false));
   EXPECT_TRUE(cached_area->GetItem(kConnectionId, kKey).is_null());
 
   // Call the load completion callback.
   mock_proxy_->CompleteOnePendingCallback(true);
-  EXPECT_FALSE(IsIgnoringAllMutations(cached_area));
+  EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get()));
 
   // Verify that mutations are now applied.
   cached_area->ApplyMutation(NullableString16(kKey, false),
                              NullableString16(kValue, false));
   EXPECT_EQ(kValue, cached_area->GetItem(kConnectionId, kKey).string());
 }
 
 TEST_F(DomStorageCachedAreaTest, MutationsAreIgnoredUntilClearCompletion) {
   const int kConnectionId = 4;
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
   cached_area->Clear(kConnectionId, kPageUrl);
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
   mock_proxy_->CompleteOnePendingCallback(true);
-  EXPECT_FALSE(IsIgnoringAllMutations(cached_area));
+  EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get()));
 
   // Verify that calling Clear twice works as expected, the first
   // completion callback should have been cancelled.
-  ResetCacheOnly(cached_area);
+  ResetCacheOnly(cached_area.get());
   cached_area->Clear(kConnectionId, kPageUrl);
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
   cached_area->Clear(kConnectionId, kPageUrl);
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
   mock_proxy_->CompleteOnePendingCallback(true);
-  EXPECT_TRUE(IsIgnoringAllMutations(cached_area));
+  EXPECT_TRUE(IsIgnoringAllMutations(cached_area.get()));
   mock_proxy_->CompleteOnePendingCallback(true);
-  EXPECT_FALSE(IsIgnoringAllMutations(cached_area));
+  EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get()));
 }
 
 TEST_F(DomStorageCachedAreaTest, KeyMutationsAreIgnoredUntilCompletion) {
   const int kConnectionId = 8;
   scoped_refptr<DomStorageCachedArea> cached_area =
-      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_);
+      new DomStorageCachedArea(kNamespaceId, kOrigin, mock_proxy_.get());
 
   // SetItem
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
   mock_proxy_->CompleteOnePendingCallback(true);  // load completion
-  EXPECT_FALSE(IsIgnoringAllMutations(cached_area));
-  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_FALSE(IsIgnoringAllMutations(cached_area.get()));
+  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   cached_area->ApplyMutation(NullableString16(kKey, false),
                              NullableString16(true));
   EXPECT_EQ(kValue, cached_area->GetItem(kConnectionId, kKey).string());
   mock_proxy_->CompleteOnePendingCallback(true);  // set completion
-  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey));
 
   // RemoveItem
   cached_area->RemoveItem(kConnectionId, kKey, kPageUrl);
-  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   mock_proxy_->CompleteOnePendingCallback(true);  // remove completion
-  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey));
 
   // Multiple mutations to the same key.
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
   cached_area->RemoveItem(kConnectionId, kKey, kPageUrl);
-  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   mock_proxy_->CompleteOnePendingCallback(true);  // set completion
-  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   mock_proxy_->CompleteOnePendingCallback(true);  // remove completion
-  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey));
 
   // A failed set item operation should Reset the cache.
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
-  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
+  EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   mock_proxy_->CompleteOnePendingCallback(false);
-  EXPECT_FALSE(IsPrimed(cached_area));
+  EXPECT_FALSE(IsPrimed(cached_area.get()));
 }
 
 }  // namespace dom_storage