Add network_handler_callbacks.cc

This does some cleanup to allow NetworkStateHandler to use the same error callback infrastructure as NetworkConfigurationHandler.
It also adds event logging for errors.

BUG=none

Review URL: https://codereview.chromium.org/11416149

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169475 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 16 deletions

diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc
index 2fe6f99..ec9331b 100644
--- a/chromeos/network/shill_property_handler.cc
+++ b/chromeos/network/shill_property_handler.cc
@@ -28,12 +28,6 @@ const char kLogModule[] = "ShillPropertyHandler";
 // order, it should be reasonable to ignore services past this.
 const size_t kMaxObservedServices = 100;
 
-void ErrorCallbackFunction(const std::string& error_name,
-                           const std::string& error_message) {
-  // TODO(stevenjb): Add error logging.
-  LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
-}
-
 const base::ListValue* GetListValue(const std::string& key,
                                     const base::Value& value) {
   const base::ListValue* vlist = NULL;
@@ -72,22 +66,29 @@ void ShillPropertyHandler::Init() {
 
 void ShillPropertyHandler::SetTechnologyEnabled(
     const std::string& technology,
-    bool enabled) {
+    bool enabled,
+    const network_handler::ErrorCallback& error_callback) {
   if (enabled) {
-    shill_manager_->EnableTechnology(technology,
-                                     base::Bind(&base::DoNothing),
-                                     base::Bind(&ErrorCallbackFunction));
+    shill_manager_->EnableTechnology(
+        technology,
+        base::Bind(&base::DoNothing),
+        base::Bind(&network_handler::ShillErrorCallbackFunction,
+                   kLogModule, technology, error_callback));
   } else {
-    shill_manager_->DisableTechnology(technology,
-                                      base::Bind(&base::DoNothing),
-                                      base::Bind(&ErrorCallbackFunction));
+    shill_manager_->DisableTechnology(
+        technology,
+        base::Bind(&base::DoNothing),
+        base::Bind(&network_handler::ShillErrorCallbackFunction,
+                   kLogModule, technology, error_callback));
   }
 }
 
 void ShillPropertyHandler::RequestScan() const {
-  shill_manager_->RequestScan("",
-                              base::Bind(&base::DoNothing),
-                              base::Bind(&ErrorCallbackFunction));
+  shill_manager_->RequestScan(
+      "",
+      base::Bind(&base::DoNothing),
+      base::Bind(&network_handler::ShillErrorCallbackFunction,
+                 kLogModule, "", network_handler::ErrorCallback()));
 }
 
 void ShillPropertyHandler::RequestProperties(ManagedState::ManagedType type,