Add FlushStore to CookieStore interface.

chrome/browser/android/chrome_application.cc

 // Copyright 2013 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 "chrome/browser/android/chrome_application.h"
 
 #include <vector>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ChromeApplication_jni.h"
-#include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using base::android::ConvertUTF8ToJavaString;
 
 namespace {
 
 void FlushCookiesOnIOThread(
     scoped_refptr<net::URLRequestContextGetter> getter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  getter->GetURLRequestContext()
-      ->cookie_store()
-      ->GetCookieMonster()
-      ->FlushStore(base::Closure());
+  getter->GetURLRequestContext()->cookie_store()->FlushStore(base::Closure());
 }
 
 void FlushStoragePartition(content::StoragePartition* partition) {
   partition->Flush();
 }
 
 void CommitPendingWritesForProfile(Profile* profile) {
   // These calls are asynchronous. They may not finish (and may not even
   // start!) before the Android OS kills our process. But we can't wait for them
   // to finish because blocking the UI thread is illegal.
@@ skipping 97 matching lines @@
 }
 
 bool ChromeApplication::AreParentalControlsEnabled() {
   return Java_ChromeApplication_areParentalControlsEnabled(
       base::android::AttachCurrentThread(),
       base::android::GetApplicationContext());
 }
 
 }  // namespace android
 }  // namespace chrome