Adding policy support to the new network configuration stack.

chrome/browser/chromeos/extensions/networking_private_api.cc

Index: chrome/browser/chromeos/extensions/networking_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/networking_private_api.cc b/chrome/browser/chromeos/extensions/networking_private_api.cc
index a90c6c2ca7532820f3d938490b42f53bea56c833..e1dd6a6b203912d3f98545865852f6baee298833 100644
--- a/chrome/browser/chromeos/extensions/networking_private_api.cc
+++ b/chrome/browser/chromeos/extensions/networking_private_api.cc
@@ -32,14 +32,11 @@ bool NetworkingPrivateGetPropertiesFunction::RunImpl() {
   scoped_ptr<api::GetProperties::Params> params =
       api::GetProperties::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
-  // The |network_guid| parameter is storing the service path.
-  std::string service_path = params->network_guid;
 
   ManagedNetworkConfigurationHandler::Get()->GetProperties(
-      service_path,
-      base::Bind(
-          &NetworkingPrivateGetPropertiesFunction::GetPropertiesSuccess,
-          this),
+      params->network_guid,  // service path
+      base::Bind(&NetworkingPrivateGetPropertiesFunction::GetPropertiesSuccess,
+                 this),
       base::Bind(&NetworkingPrivateGetPropertiesFunction::GetPropertiesFailed,
                  this));
   return true;
@@ -63,6 +60,44 @@ void NetworkingPrivateGetPropertiesFunction::GetPropertiesFailed(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateGetManagedPropertiesFunction
+
+NetworkingPrivateGetManagedPropertiesFunction::
+  ~NetworkingPrivateGetManagedPropertiesFunction() {
+}
+
+bool NetworkingPrivateGetManagedPropertiesFunction::RunImpl() {
+  scoped_ptr<api::GetManagedProperties::Params> params =
+      api::GetManagedProperties::Params::Create(*args_);
+  EXTENSION_FUNCTION_VALIDATE(params);
+
+  ManagedNetworkConfigurationHandler::Get()->GetManagedProperties(
+      params->network_guid,  // service path
+      base::Bind(&NetworkingPrivateGetManagedPropertiesFunction::Success,
+                 this),
+      base::Bind(&NetworkingPrivateGetManagedPropertiesFunction::Failure,
+                 this));
+  return true;
+}
+
+void NetworkingPrivateGetManagedPropertiesFunction::Success(
+    const std::string& service_path,
+    const base::DictionaryValue& dictionary) {
+  base::DictionaryValue* network_properties = dictionary.DeepCopy();
+  network_properties->SetStringWithoutPathExpansion(onc::network_config::kGUID,
+                                                    service_path);
+  SetResult(network_properties);
+  SendResponse(true);
+}
+
+void NetworkingPrivateGetManagedPropertiesFunction::Failure(
+    const std::string& error_name,
+    scoped_ptr<base::DictionaryValue> error_data) {
+  error_ = error_name;
+  SendResponse(false);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // NetworkingPrivateGetStateFunction
 
 NetworkingPrivateGetStateFunction::
@@ -110,7 +145,7 @@ bool NetworkingPrivateSetPropertiesFunction::RunImpl() {
       params->properties.ToValue());
 
   ManagedNetworkConfigurationHandler::Get()->SetProperties(
-      params->network_guid,
+      params->network_guid,  // service path
       *properties_dict,
       base::Bind(&NetworkingPrivateSetPropertiesFunction::ResultCallback,
                  this),
@@ -210,11 +245,8 @@ bool NetworkingPrivateStartConnectFunction::RunImpl() {
       api::StartConnect::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // The |network_guid| parameter is storing the service path.
-  std::string service_path = params->network_guid;
-
   ManagedNetworkConfigurationHandler::Get()->Connect(
-      service_path,
+      params->network_guid,  // service path
       base::Bind(
           &NetworkingPrivateStartConnectFunction::ConnectionStartSuccess,
           this),
@@ -247,11 +279,8 @@ bool NetworkingPrivateStartDisconnectFunction::RunImpl() {
       api::StartDisconnect::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  // The |network_guid| parameter is storing the service path.
-  std::string service_path = params->network_guid;
-
   ManagedNetworkConfigurationHandler::Get()->Disconnect(
-      service_path,
+      params->network_guid,  // service path
       base::Bind(
           &NetworkingPrivateStartDisconnectFunction::DisconnectionStartSuccess,
           this),