Revert 256579 "Allow the content browser client to specify a spe..."

trunk/src/net/url_request/url_request_http_job.cc

Index: trunk/src/net/url_request/url_request_http_job.cc
===================================================================
--- trunk/src/net/url_request/url_request_http_job.cc	(revision 256581)
+++ trunk/src/net/url_request/url_request_http_job.cc	(working copy)
@@ -539,7 +539,7 @@
   if (!request_)
     return;
 
-  CookieStore* cookie_store = GetCookieStore();
+  CookieStore* cookie_store = request_->context()->cookie_store();
   if (cookie_store && !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES)) {
     net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster();
     if (cookie_monster) {
@@ -558,7 +558,7 @@
 void URLRequestHttpJob::DoLoadCookies() {
   CookieOptions options;
   options.set_include_httponly();
-  GetCookieStore()->GetCookiesWithOptionsAsync(
+  request_->context()->cookie_store()->GetCookiesWithOptionsAsync(
       request_->url(), options,
       base::Bind(&URLRequestHttpJob::OnCookiesLoaded,
                  weak_factory_.GetWeakPtr()));
@@ -638,7 +638,8 @@
       new SharedBoolean(true);
 
   if (!(request_info_.load_flags & LOAD_DO_NOT_SAVE_COOKIES) &&
-      GetCookieStore() && response_cookies_.size() > 0) {
+      request_->context()->cookie_store() &&
+      response_cookies_.size() > 0) {
     CookieOptions options;
     options.set_include_httponly();
     options.set_server_time(response_date_);
@@ -656,7 +657,7 @@
       if (CanSetCookie(
           response_cookies_[response_cookies_save_index_], &options)) {
         callback_pending->data = true;
-        GetCookieStore()->SetCookieWithOptionsAsync(
+        request_->context()->cookie_store()->SetCookieWithOptionsAsync(
             request_->url(), response_cookies_[response_cookies_save_index_],
             options, callback);
       }