Revert 74842 - It seems to have broken the ChromeOS "PFQ bot"?

r74561 added a DCHECK to make sure users didn't try to access the ChromeURLRequestContextGetter from the Profile, since the Profile should only be read on the UI thread. ChromeOS apparently tried to access it from another thread, and therefore hit the new DCHECK.

I'm relanding without the DCHECK. I'm also eagerly initializing the off the record context getter to prevent the ChromeOS race. ChromeOS should fix that code so the eager initialization isn't necessary.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6484041

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6517021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74848 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index 0557c64..b51975c 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -73,12 +73,12 @@ HttpBridge::RequestContext::RequestContext(
     : baseline_context_(baseline_context) {
 
   // Create empty, in-memory cookie store.
-  set_cookie_store(new net::CookieMonster(NULL, NULL));
+  cookie_store_ = new net::CookieMonster(NULL, NULL);
 
   // We don't use a cache for bridged loads, but we do want to share proxy info.
-  set_host_resolver(baseline_context->host_resolver());
-  set_proxy_service(baseline_context->proxy_service());
-  set_ssl_config_service(baseline_context->ssl_config_service());
+  host_resolver_ = baseline_context->host_resolver();
+  proxy_service_ = baseline_context->proxy_service();
+  ssl_config_service_ = baseline_context->ssl_config_service();
 
   // We want to share the HTTP session data with the network layer factory,
   // which includes auth_cache for proxies.
@@ -87,7 +87,7 @@ HttpBridge::RequestContext::RequestContext(
   net::HttpNetworkSession* session =
       baseline_context->http_transaction_factory()->GetSession();
   DCHECK(session);
-  set_http_transaction_factory(new net::HttpNetworkLayer(session));
+  http_transaction_factory_ = new net::HttpNetworkLayer(session);
 
   // TODO(timsteele): We don't currently listen for pref changes of these
   // fields or CookiePolicy; I'm not sure we want to strictly follow the
@@ -96,19 +96,19 @@ HttpBridge::RequestContext::RequestContext(
   // should be tied to whatever the sync servers expect (if anything). These
   // fields should probably just be settable by sync backend; though we should
   // figure out if we need to give the user explicit control over policies etc.
-  set_accept_language(baseline_context->accept_language());
-  set_accept_charset(baseline_context->accept_charset());
+  accept_language_ = baseline_context->accept_language();
+  accept_charset_ = baseline_context->accept_charset();
 
   // We default to the browser's user agent. This can (and should) be overridden
   // with set_user_agent.
-  set_user_agent(webkit_glue::GetUserAgent(GURL()));
+  user_agent_ = webkit_glue::GetUserAgent(GURL());
 
-  set_net_log(baseline_context->net_log());
+  net_log_ = baseline_context->net_log();
 }
 
 HttpBridge::RequestContext::~RequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  delete http_transaction_factory();
+  delete http_transaction_factory_;
 }
 
 HttpBridge::HttpBridge(HttpBridge::RequestContextGetter* context_getter)