Only import certificates with Web trust from ONC if the user is managed and matches the enterprise …

chrome/browser/policy/network_configuration_updater.h

Index: chrome/browser/policy/network_configuration_updater.h
diff --git a/chrome/browser/policy/network_configuration_updater.h b/chrome/browser/policy/network_configuration_updater.h
index 325d10fcf7adff36a5344a343e69030a82c5af0f..8a73d527c5d198f003086cbafd798f4bbb982354 100644
--- a/chrome/browser/policy/network_configuration_updater.h
+++ b/chrome/browser/policy/network_configuration_updater.h
@@ -16,10 +16,12 @@ class Value;
 
 namespace chromeos {
 class NetworkLibrary;
+class UserManager;
 }
 
 namespace policy {
 
+class BrowserPolicyConnector;
 class PolicyMap;
 
 // Keeps track of the network configuration policy settings and updates the
@@ -27,7 +29,9 @@ class PolicyMap;
 class NetworkConfigurationUpdater {
  public:
   NetworkConfigurationUpdater(PolicyService* policy_service,
-                              chromeos::NetworkLibrary* network_library);
+                              BrowserPolicyConnector* connector,
+                              chromeos::NetworkLibrary* network_library,
+                              chromeos::UserManager* user_manager);

[Mattias Nissler (ping if slow), 2012/08/28 11:57:56]

These are some heavy-weight dependencies (and indeed, we're cyclic due to
BrowserPolicyConnector). Would it be possible to just put a boolean flag into
this class that's updated appropriately when the user logs in?

[Joao da Silva, 2012/09/03 15:24:32]

Done, moved the logic to chrome_browser_main_chromeos.cc.

   virtual ~NetworkConfigurationUpdater();
 
   // Empty network configuration blob.
@@ -45,9 +49,15 @@ class NetworkConfigurationUpdater {
   // Wraps the policy service we read network configuration from.
   PolicyChangeRegistrar policy_change_registrar_;
 
+  // Used to determine the user affiliation.
+  BrowserPolicyConnector* connector_;
+
   // Network library to write network configuration to.
   chromeos::NetworkLibrary* network_library_;
 
+  // Used to determine if a user is logged in.
+  chromeos::UserManager* user_manager_;
+
   // Current settings.
   std::string device_network_config_;
   std::string user_network_config_;