CookieStore: Remove reference counting.

ios/net/cookies/cookie_store_ios_unittest.mm

 // Copyright 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 "ios/net/cookies/cookie_store_ios.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/bind_helpers.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/cookies/cookie_store_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 // Clears the underlying NSHTTPCookieStorage.
 void ClearCookies() {
   NSHTTPCookieStorage* store = [NSHTTPCookieStorage sharedHTTPCookieStorage];
   [store setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
   NSArray* cookies = [store cookies];
   for (NSHTTPCookie* cookie in cookies)
     [store deleteCookie:cookie];
   EXPECT_EQ(0u, [[store cookies] count]);
 }
 }  // namespace
 
 namespace net {
 
 struct CookieStoreIOSTestTraits {
-  static net::CookieStore* Create() {
+  static scoped_ptr<net::CookieStore> Create() {
     ClearCookies();
-    CookieStoreIOS* store = new CookieStoreIOS(nullptr);
+    scoped_ptr<CookieStoreIOS> store(new CookieStoreIOS(nullptr));
     store->synchronization_state_ = CookieStoreIOS::SYNCHRONIZED;
-    return store;
+    return std::move(store);
   }
 
   static const bool supports_http_only = false;
   static const bool supports_non_dotted_domains = false;
   static const bool preserves_trailing_dots = false;
   static const bool filters_schemes = false;
   static const bool has_path_prefix_bug = true;
   static const int creation_time_granularity_in_ms = 1000;
   static const bool enforce_strict_secure = false;
 
   base::MessageLoop loop_;
 };
 
 struct InactiveCookieStoreIOSTestTraits {
-  static scoped_refptr<net::CookieStore> Create() {
-    return new CookieStoreIOS(nullptr);
+  static scoped_ptr<net::CookieStore> Create() {
+    return make_scoped_ptr(new CookieStoreIOS(nullptr));
   }
 
   static const bool is_cookie_monster = false;
   static const bool supports_http_only = false;
   static const bool supports_non_dotted_domains = true;
   static const bool preserves_trailing_dots = true;
   static const bool filters_schemes = false;
   static const bool has_path_prefix_bug = false;
   static const int creation_time_granularity_in_ms = 0;
   static const int enforces_prefixes = true;
   static const bool enforce_strict_secure = false;
 
   base::MessageLoop loop_;
 };
 
 // RoundTripTestCookieStore is un-synchronized and re-synchronized after all
 // cookie operations. This means all system cookies are converted to Chrome
 // cookies and converted back.
 // The purpose of this class is to test that cookie conversions do not break the
 // cookie store.
 class RoundTripTestCookieStore : public net::CookieStore {
  public:
   RoundTripTestCookieStore()
       : store_(new CookieStoreIOS(nullptr)),
         dummy_store_(new CookieStoreIOS(nullptr)) {
     CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   }
 
+  ~RoundTripTestCookieStore() override { store_->UnSynchronize(); }
+
   // Inherited CookieStore methods.
   void SetCookieWithOptionsAsync(const GURL& url,
                                  const std::string& cookie_line,
                                  const net::CookieOptions& options,
                                  const SetCookiesCallback& callback) override {
     RoundTrip();
     store_->SetCookieWithOptionsAsync(url, cookie_line, options, callback);
   }
 
   void SetCookieWithDetailsAsync(const GURL& url,
@@ skipping 78 matching lines @@
     store_->FlushStore(callback);
   }
 
   scoped_ptr<CookieStore::CookieChangedSubscription> AddCallbackForCookie(
       const GURL& url,
       const std::string& name,
       const CookieChangedCallback& callback) override {
     return scoped_ptr<CookieStore::CookieChangedSubscription>();
   }
 
- protected:
-  ~RoundTripTestCookieStore() override { store_->UnSynchronize(); }
-
  private:
   void RoundTrip() {
     CookieStoreIOS::SwitchSynchronizedStore(store_.get(), dummy_store_.get());
     // Check that the system store is empty, because it is synchronized with
     // |dummy_store_| which is empty.
     NSHTTPCookieStorage* store = [NSHTTPCookieStorage sharedHTTPCookieStorage];
     EXPECT_EQ(0u, [[store cookies] count]);
     CookieStoreIOS::SwitchSynchronizedStore(dummy_store_.get(), store_.get());
   }
 
-  scoped_refptr<CookieStoreIOS> store_;
+  scoped_ptr<CookieStoreIOS> store_;
   // |dummy_store_| is not directly used, but is needed to make |store_|
   // inactive.
-  scoped_refptr<CookieStoreIOS> dummy_store_;
+  scoped_ptr<CookieStoreIOS> dummy_store_;
 };
 
 struct RoundTripTestCookieStoreTraits {
-  static scoped_refptr<net::CookieStore> Create() {
+  static scoped_ptr<net::CookieStore> Create() {
     ClearCookies();
-    return new RoundTripTestCookieStore();
+    return make_scoped_ptr(new RoundTripTestCookieStore());
   }
 
   static const bool is_cookie_monster = false;
   static const bool supports_http_only = false;
   static const bool supports_non_dotted_domains = false;
   static const bool preserves_trailing_dots = false;
   static const bool filters_schemes = false;
   static const bool has_path_prefix_bug = true;
   static const int creation_time_granularity_in_ms = 1000;
   static const int enforces_prefixes = true;
@@ skipping 144 matching lines @@
 }
 
 }  // namespace
 
 class CookieStoreIOSWithBackend : public testing::Test {
  public:
   CookieStoreIOSWithBackend()
       : kTestCookieURL("http://foo.google.com/bar"),
         kTestCookieURL2("http://foo.google.com/baz"),
         kTestCookieURL3("http://foo.google.com"),
-        kTestCookieURL4("http://bar.google.com/bar") {
-    backend_ = new TestPersistentCookieStore;
-    store_ = new net::CookieStoreIOS(backend_.get());
+        kTestCookieURL4("http://bar.google.com/bar"),
+        backend_(new TestPersistentCookieStore),
+        store_(new net::CookieStoreIOS(backend_.get())) {
     net::CookieStoreIOS::SetCookiePolicy(net::CookieStoreIOS::ALLOW);
     cookie_changed_callback_ = store_->AddCallbackForCookie(
         kTestCookieURL, "abc",
         base::Bind(&RecordCookieChanges, &cookies_changed_, &cookies_removed_));
   }
 
   ~CookieStoreIOSWithBackend() override {}
 
   // Gets the cookies. |callback| will be called on completion.
   void GetCookies(const net::CookieStore::GetCookiesCallback& callback) {
@@ skipping 44 matching lines @@
   }
 
  protected:
   const GURL kTestCookieURL;
   const GURL kTestCookieURL2;
   const GURL kTestCookieURL3;
   const GURL kTestCookieURL4;
 
   base::MessageLoop loop_;
   scoped_refptr<TestPersistentCookieStore> backend_;
-  scoped_refptr<net::CookieStoreIOS> store_;
+  scoped_ptr<net::CookieStoreIOS> store_;
   scoped_ptr<net::CookieStore::CookieChangedSubscription>
       cookie_changed_callback_;
   std::vector<net::CanonicalCookie> cookies_changed_;
   std::vector<bool> cookies_removed_;
 };
 
 }  // namespace
 
 namespace net {
 
@@ skipping 79 matching lines @@
   EXPECT_EQ(1U, cookies_changed_.size());
   SetCookie("abc=def");
   EXPECT_EQ(1U, cookies_changed_.size());
   store_->UnSynchronize();
 }
 
 TEST(CookieStoreIOS, GetAllCookiesForURLAsync) {
   base::MessageLoop loop;
   const GURL kTestCookieURL("http://foo.google.com/bar");
   ClearCookies();
-  scoped_refptr<CookieStoreIOS> cookie_store(new CookieStoreIOS(nullptr));
+  scoped_ptr<CookieStoreIOS> cookie_store(new CookieStoreIOS(nullptr));
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get());
   // Add a cookie.
   net::CookieOptions options;
   options.set_include_httponly();
   cookie_store->SetCookieWithOptionsAsync(
       kTestCookieURL, "a=b", options, net::CookieStore::SetCookiesCallback());
   // Disallow cookies.
   CookieStoreIOS::SetCookiePolicy(CookieStoreIOS::BLOCK);
   // No cookie in the system store.
   NSHTTPCookieStorage* system_store =
@@ skipping 57 matching lines @@
   backend_->RunLoadedCallback();
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ("a=b", callback.cookie_line());
   store_->UnSynchronize();
 }
 
 // Tests that Synchronization can be "aborted" (i.e. the cookie store is
 // unsynchronized while synchronization is in progress).
 TEST_F(CookieStoreIOSWithBackend, SyncThenUnsync) {
   ClearCookies();
-  scoped_refptr<CookieStoreIOS> dummy_store = new CookieStoreIOS(nullptr);
+  scoped_ptr<CookieStoreIOS> dummy_store(new CookieStoreIOS(nullptr));
   // Switch back and forth before synchronization can complete.
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   CookieStoreIOS::SwitchSynchronizedStore(store_.get(), dummy_store.get());
   backend_->RunLoadedCallback();
   // No cookie leak in the system store.
   NSHTTPCookieStorage* store = [NSHTTPCookieStorage sharedHTTPCookieStorage];
   EXPECT_EQ(0u, [[store cookies] count]);
   // No cookie lost.
   GetCookieCallback callback;
   GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ("a=b", callback.cookie_line());
   dummy_store->UnSynchronize();
 }
 
 // Tests that Synchronization can be "aborted" while there are pending tasks
 // (i.e. the cookie store is unsynchronized while synchronization is in progress
 // and there are pending tasks).
 TEST_F(CookieStoreIOSWithBackend, SyncThenUnsyncWithPendingTasks) {
   ClearCookies();
-  scoped_refptr<CookieStoreIOS> dummy_store = new CookieStoreIOS(nullptr);
+  scoped_ptr<CookieStoreIOS> dummy_store(new CookieStoreIOS(nullptr));
   // Start synchornization.
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   // Create a pending task while synchronization is in progress.
   GetCookieCallback callback;
   GetCookies(base::Bind(&GetCookieCallback::Run, base::Unretained(&callback)));
   // Cancel the synchronization.
   CookieStoreIOS::SwitchSynchronizedStore(store_.get(), dummy_store.get());
   // Synchronization completes after being cancelled.
   backend_->RunLoadedCallback();
   // The task is not lost.
@@ skipping 77 matching lines @@
 }
 
 TEST_F(CookieStoreIOSWithBackend, FlushOnUnSynchronize) {
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   EXPECT_FALSE(backend_->flushed());
   store_->UnSynchronize();
   EXPECT_TRUE(backend_->flushed());
 }
 
 TEST_F(CookieStoreIOSWithBackend, FlushOnSwitch) {
-  scoped_refptr<CookieStoreIOS> dummy_store = new CookieStoreIOS(nullptr);
+  scoped_ptr<CookieStoreIOS> dummy_store(new CookieStoreIOS(nullptr));
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   EXPECT_FALSE(backend_->flushed());
   CookieStoreIOS::SwitchSynchronizedStore(store_.get(), dummy_store.get());
   EXPECT_TRUE(backend_->flushed());
   dummy_store->UnSynchronize();
 }
 
 TEST_F(CookieStoreIOSWithBackend, FlushOnCookieChanged) {
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   store_->set_flush_delay_for_testing(base::TimeDelta());
@@ skipping 245 matching lines @@
   EXPECT_EQ(2U, cookies.size());
   // this deletes the callback
   handle.reset();
   SetSystemCookie(kTestCookieURL, "abc", "jkl");
   EXPECT_EQ(2U, cookies.size());
   DeleteSystemCookie(kTestCookieURL, "abc");
   store_->UnSynchronize();
 }
 
 }  // namespace net