Add NetworkHandler to own network handlers in src/chromeos/network

chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

 // Copyright (c) 2013 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/chromeos/policy/network_configuration_updater_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chromeos/network/certificate_handler.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
 NetworkConfigurationUpdaterImpl::NetworkConfigurationUpdaterImpl(
     PolicyService* policy_service,
-    chromeos::ManagedNetworkConfigurationHandler* network_config_handler,

[pneubeck (no reviews), 2013/05/13 09:17:06]

What is the improvement here? How will it make writing the missing test easier
(which will use a StrictMock of the config handler)?

[stevenjb, 2013/05/13 23:49:35]

See meta comment

     scoped_ptr<chromeos::CertificateHandler> certificate_handler)
     : policy_change_registrar_(
           policy_service, PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())),
       policy_service_(policy_service),
-      network_config_handler_(network_config_handler),
       certificate_handler_(certificate_handler.Pass()) {
   policy_change_registrar_.Observe(
       key::kDeviceOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdaterImpl::OnPolicyChanged,
                  base::Unretained(this),
                  chromeos::onc::ONC_SOURCE_DEVICE_POLICY));
   policy_change_registrar_.Observe(
       key::kOpenNetworkConfiguration,
       base::Bind(&NetworkConfigurationUpdaterImpl::OnPolicyChanged,
                  base::Unretained(this),
@@ skipping 49 matching lines @@
   }
   VLOG(2) << "The policy contains this ONC: " << onc_blob;
 
   base::ListValue network_configs;
   base::ListValue certificates;
   ParseAndValidateOncForImport(
       onc_blob, onc_source, "", &network_configs, &certificates);
 
   std::string userhash = onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY ?
       hashed_username_ : std::string();
-  network_config_handler_->SetPolicy(onc_source, userhash, network_configs);
+  chromeos::NetworkHandler::Get()->managed_network_configuration_handler()->
+      SetPolicy(onc_source, userhash, network_configs);
 
   scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);
   certificate_handler_->ImportCertificates(
       certificates, onc_source, web_trust_certs.get());
 
   if (onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY)
     SetTrustAnchors(web_trust_certs.Pass());
 }
 
 }  // namespace policy