Add FlushStore to CookieStore interface.

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/message_loop/message_loop.h"
@@ skipping 114 matching lines @@
     RoundTrip();
     store_->DeleteAllCreatedBetweenForHostAsync(delete_begin, delete_end, url,
                                                 callback);
   }
 
   void DeleteSessionCookiesAsync(const DeleteCallback& callback) override {
     RoundTrip();
     store_->DeleteSessionCookiesAsync(callback);
   }
 
+  void FlushStore(const base::Closure& callback) override {
+    RoundTrip();
+    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(); }
 
@@ skipping 355 matching lines @@
   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 =
       [NSHTTPCookieStorage sharedHTTPCookieStorage];
   EXPECT_EQ(0u, [[system_store cookies] count]);
   // Flushing should not have any effect.
-  cookie_store->Flush(base::Closure());
+  cookie_store->FlushStore(base::Closure());
   // Check we can get the cookie even though cookies are disabled.
   GetAllCookiesCallback callback;
   cookie_store->GetAllCookiesForURLAsync(
       kTestCookieURL,
       base::Bind(&GetAllCookiesCallback::Run, base::Unretained(&callback)));
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(1u, callback.cookie_list().size());
   net::CanonicalCookie cookie = callback.cookie_list()[0];
   EXPECT_EQ("a", cookie.Name());
   EXPECT_EQ("b", cookie.Value());
@@ skipping 189 matching lines @@
 
   store_->UnSynchronize();
 }
 
 TEST_F(CookieStoreIOSWithBackend, ManualFlush) {
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   backend_->RunLoadedCallback();
   EXPECT_FALSE(backend_->flushed());
 
   // The store should be flushed even if it is not dirty.
-  store_->Flush(base::Closure());
+  store_->FlushStore(base::Closure());
   EXPECT_TRUE(backend_->flushed());
 
   store_->UnSynchronize();
 }
 
 TEST_F(CookieStoreIOSWithBackend, FlushOnPolicyChange) {
   // Start synchronization.
   CookieStoreIOS::SwitchSynchronizedStore(nullptr, store_.get());
   // Toggle cookie policy to trigger a flush.
   EXPECT_FALSE(backend_->flushed());
@@ skipping 218 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