Merge 184868

chrome/browser/profiles/profile_impl_io_data.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 "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 370 matching lines @@
         base::WorkerPool::GetTaskRunner(true));
   }
 
   // setup cookie store
   if (!cookie_store) {
     DCHECK(!lazy_params_->cookie_path.empty());
 
     scoped_refptr<SQLitePersistentCookieStore> cookie_db =
         new SQLitePersistentCookieStore(
             lazy_params_->cookie_path,
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
             lazy_params_->restore_old_session_cookies,
             new ClearOnExitPolicy(lazy_params_->special_storage_policy));
     cookie_store =
         new net::CookieMonster(cookie_db.get(),
                                profile_params->cookie_monster_delegate);
     cookie_store->GetCookieMonster()->SetPersistSessionCookies(true);
   }
 
   main_context->set_cookie_store(cookie_store);
 
@@ skipping 88 matching lines @@
 
   extensions_context->set_net_log(io_thread->net_log());
 
   extensions_context->set_throttler_manager(
       io_thread_globals->throttler_manager.get());
 
   net::CookieMonster* extensions_cookie_store =
       new net::CookieMonster(
           new SQLitePersistentCookieStore(
               lazy_params_->extensions_cookie_path,
+              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
               lazy_params_->restore_old_session_cookies, NULL), NULL);
   // Enable cookies for devtools and extension URLs.
   const char* schemes[] = {chrome::kChromeDevToolsScheme,
                            extensions::kExtensionScheme};
   extensions_cookie_store->SetCookieableSchemes(schemes, 2);
   extensions_context->set_cookie_store(extensions_cookie_store);
 
 #if !defined(DISABLE_FTP_SUPPORT)
   DCHECK(ftp_factory_.get());
   extensions_context->set_ftp_transaction_factory(ftp_factory_.get());
@@ skipping 76 matching lines @@
     cookie_store = new net::CookieMonster(NULL, NULL);
     app_http_cache->set_mode(
         record_mode ? net::HttpCache::RECORD : net::HttpCache::PLAYBACK);
   }
 
   // Use an app-specific cookie store.
   if (!cookie_store) {
     DCHECK(!cookie_path.empty());
 
     scoped_refptr<SQLitePersistentCookieStore> cookie_db =
-        new SQLitePersistentCookieStore(cookie_path, false, NULL);
+        new SQLitePersistentCookieStore(
+            cookie_path,
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+            false,
+            NULL);
     // TODO(creis): We should have a cookie delegate for notifying the cookie
     // extensions API, but we need to update it to understand isolated apps
     // first.
     cookie_store = new net::CookieMonster(cookie_db.get(), NULL);
   }
 
   // Transfer ownership of the cookies and cache to AppRequestContext.
   context->SetCookieStore(cookie_store);
   context->SetHttpTransactionFactory(
       scoped_ptr<net::HttpTransactionFactory>(app_http_cache));
@@ skipping 137 matching lines @@
     base::Time time,
     const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);  // Completes synchronously.
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }