Remove DONTUSEME_GetCookieStore().

chrome/browser/net/chrome_url_request_context.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/net/chrome_url_request_context.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/synchronization/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 118 matching lines @@
     factory_.reset();
   }
 
   // Should not be NULL, unless we're trying to use the URLRequestContextGetter
   // after the Profile has already been deleted.
   CHECK(url_request_context_.get());
 
   return url_request_context_;
 }
 
-net::CookieStore* ChromeURLRequestContextGetter::DONTUSEME_GetCookieStore() {
-  // If we are running on the IO thread this is real easy.
-  if (BrowserThread::CurrentlyOn(BrowserThread::IO))
-    return GetURLRequestContext()->cookie_store();
-
-  // If we aren't running on the IO thread, we cannot call
-  // GetURLRequestContext(). Instead we will post a task to the IO loop
-  // and wait for it to complete.
-
-  base::WaitableEvent completion(false, false);
-  net::CookieStore* result = NULL;
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&ChromeURLRequestContextGetter::GetCookieStoreAsyncHelper,
-          this,
-          &completion,
-          &result));
-
-  completion.Wait();
-  DCHECK(result);
-  return result;
-}
-
 scoped_refptr<base::MessageLoopProxy>
 ChromeURLRequestContextGetter::GetIOMessageLoopProxy() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 // static
 ChromeURLRequestContextGetter* ChromeURLRequestContextGetter::CreateOriginal(
     Profile* profile,
     const ProfileIOData* profile_io_data) {
   DCHECK(!profile->IsOffTheRecord());
@@ skipping 144 matching lines @@
       GetURLRequestContext()->cookie_store()->GetCookieMonster();
 
   // If there is no cookie monster, this function does nothing. If
   // clear_site_data is true, this is most certainly not the expected behavior.
   DCHECK(!clear_site_data || cookie_monster);
 
   if (cookie_monster)
     cookie_monster->SetClearPersistentStoreOnExit(clear_site_data);
 }
 
-void ChromeURLRequestContextGetter::GetCookieStoreAsyncHelper(
-    base::WaitableEvent* completion,
-    net::CookieStore** result) {
-  // Note that CookieStore is refcounted, yet we do not add a reference.
-  *result = GetURLRequestContext()->cookie_store();
-  completion->Signal();
-}
-
 // ----------------------------------------------------------------------------
 // ChromeURLRequestContext
 // ----------------------------------------------------------------------------
 
 ChromeURLRequestContext::ChromeURLRequestContext()
     : is_incognito_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
@@ skipping 31 matching lines @@
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_referrer_charset(default_charset);
   set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
 }