Adding policy support to the new network configuration stack.

chrome/browser/policy/browser_policy_connector.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/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 40 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/app_pack_updater.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/policy/network_configuration_updater.h"
+#include "chrome/browser/chromeos/policy/network_configuration_updater_impl.h"
+#include "chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #endif
 
 using content::BrowserThread;
 
 namespace policy {
@@ skipping 218 matching lines @@
   // initialized (unit tests).
   if (device_management_service_)
     device_management_service_->ScheduleInitialization(delay_milliseconds);
 }
 
 #if defined(OS_CHROMEOS)
 void BrowserPolicyConnector::InitializeUserPolicy(
     const std::string& user_name,
     bool is_public_account,
     bool wait_for_policy_fetch) {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+
   // If the user is managed then importing certificates from ONC policy is
   // allowed, otherwise it's not. Update this flag once the user has signed in,
   // and before user policy is loaded.
-  GetNetworkConfigurationUpdater()->set_allow_trusted_certificates_from_policy(
-      GetUserAffiliation(user_name) == USER_AFFILIATION_MANAGED);
+  if (!command_line->HasSwitch(
+          chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
+    GetNetworkConfigurationUpdater()->
+        set_allow_trusted_certificates_from_policy(
+            GetUserAffiliation(user_name) == USER_AFFILIATION_MANAGED);
+  }
 
   // Re-initializing user policy is disallowed for two reasons:
   // (a) Existing profiles may hold pointers to |user_cloud_policy_manager_|.
   // (b) Implementing UserCloudPolicyManager::IsInitializationComplete()
   //     correctly is impossible for re-initialization.
   CHECK(!user_cloud_policy_manager_);
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-
   base::FilePath profile_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &profile_dir));
   profile_dir = profile_dir.Append(
       command_line->GetSwitchValuePath(switches::kLoginProfile));
   const base::FilePath legacy_dir = profile_dir.Append(kDeviceManagementDir);
   const base::FilePath policy_cache_file = legacy_dir.Append(kPolicy);
   const base::FilePath token_cache_file = legacy_dir.Append(kToken);
   const base::FilePath resource_cache_dir =
       profile_dir.Append(kPolicy).Append(kResourceDir);
   base::FilePath policy_key_dir;
@@ skipping 58 matching lines @@
   if (!app_pack_updater_ && request_context_) {
     app_pack_updater_.reset(
         new AppPackUpdater(request_context_, install_attributes_.get()));
   }
   return app_pack_updater_.get();
 }
 
 NetworkConfigurationUpdater*
     BrowserPolicyConnector::GetNetworkConfigurationUpdater() {
   if (!network_configuration_updater_) {
-    network_configuration_updater_.reset(new NetworkConfigurationUpdater(
-        GetPolicyService(),
-        chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    if (command_line->HasSwitch(
+            chromeos::switches::kUseNewNetworkConfigurationHandlers)) {
+      network_configuration_updater_.reset(new NetworkConfigurationUpdaterImpl(

[pastarmovj, 2013/04/16 11:31:18]

nit: I think it will be more easily readable if you split this line before new
and join with the rest below.

[pneubeck (no reviews), 2013/04/16 14:56:28]

Done.

+          GetPolicyService()));
+    } else {
+      network_configuration_updater_.reset(
+          new NetworkConfigurationUpdaterImplCros(
+              GetPolicyService(),
+              chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
+    }
   }
   return network_configuration_updater_.get();
 }
 
 net::CertTrustAnchorProvider*
     BrowserPolicyConnector::GetCertTrustAnchorProvider() {
   return GetNetworkConfigurationUpdater()->GetCertTrustAnchorProvider();
 }
 #endif
 
@@ skipping 169 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy