Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction.

chrome/browser/policy/device_management_service.cc

 // Copyright (c) 2011 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/policy/device_management_service.h"
 
 #include "chrome/browser/browser_thread.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver.h"
 #include "net/base/load_flags.h"
@@ skipping 30 matching lines @@
     net::URLRequestContext* base_context) {
   // Share resolver, proxy service and ssl bits with the baseline context. This
   // is important so we don't make redundant requests (e.g. when resolving proxy
   // auto configuration).
   net_log_ = base_context->net_log();
   host_resolver_ = base_context->host_resolver();
   proxy_service_ = base_context->proxy_service();
   ssl_config_service_ = base_context->ssl_config_service();
 
   // Share the http session.
-  http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(
-      base_context->http_transaction_factory()->GetSession());
+  http_transaction_factory_ =
+      new net::HttpNetworkLayer(
+          base_context->http_transaction_factory()->GetSession());
 
   // No cookies, please.
   cookie_store_ = new net::CookieMonster(NULL, NULL);
 
   // Initialize these to sane values for our purposes.
   accept_language_ = "*";
   accept_charset_ = "*";
 }
 
 DeviceManagementRequestContext::~DeviceManagementRequestContext() {
@@ skipping 120 matching lines @@
     DeviceManagementJob* job = entry->second;
     job->HandleResponse(status, response_code, cookies, data);
     pending_jobs_.erase(entry);
   } else {
     NOTREACHED() << "Callback from foreign URL fetcher";
   }
   delete source;
 }
 
 }  // namespace policy