Adding error handling to ONC validation.

chrome/browser/ui/webui/net_internals/net_internals_ui.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/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 1469 matching lines @@
 
 void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
   std::string onc_blob;
   std::string passcode;
   if (list->GetSize() != 2 ||
       !list->GetString(0, &onc_blob) ||
       !list->GetString(1, &passcode)) {
     NOTREACHED();
   }
 
-  std::string error;
+  std::string messages;
   chromeos::NetworkLibrary* cros_network =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-  cros_network->LoadOncNetworks(onc_blob, passcode,
-                                chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT,
-                                false,  // allow_web_trust_from_policy
-                                &error);
+  bool success = cros_network->LoadOncNetworks(
+      onc_blob, passcode,
+      chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT,
+      false,  // allow_web_trust_from_policy
+      &messages);
+
+  LOG(WARNING) << "LoadOncNetworks result: " << (success ? "true":"false")
+               << ", " << messages;
 
   // Now that we've added the networks, we need to rescan them so they'll be
   // available from the menu more immediately.
   cros_network->RequestNetworkScan();
 
-  SendJavascriptCommand("receivedONCFileParse",
-                        Value::CreateStringValue(error));
+  base::DictionaryValue *params = new base::DictionaryValue();
+  params->Set("message", base::Value::CreateStringValue(messages));
+  params->Set("success", base::Value::CreateBooleanValue(success));
+  SendJavascriptCommand("receivedONCFileParse", params);
 }
 
 void NetInternalsMessageHandler::OnStoreDebugLogs(const ListValue* list) {
   DCHECK(!list);
   StoreDebugLogs(
       base::Bind(&NetInternalsMessageHandler::OnStoreDebugLogsCompleted,
                  AsWeakPtr()));
 }
 
 void NetInternalsMessageHandler::OnStoreDebugLogsCompleted(
@@ skipping 395 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource());
 }