This moves the ONC parsing code into chromeos/network/onc

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 6bb3a6a03a79d2dedcd66557d5d727ac18baa963..475b212eb74e195ded9c8918f8d7247ae1d3f1d8 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -71,6 +71,7 @@
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "ui/base/l10n/l10n_util.h"

[pneubeck (no reviews), 2012/12/10 09:33:10]

unused?

[Greg Spencer (Chromium), 2012/12/10 23:54:03]

Yes.  Removed.

 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
@@ -79,6 +80,7 @@
 #include "chrome/browser/chromeos/system/syslogs_provider.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon_client.h"
+#include "chromeos/network/onc/onc_constants.h"
 #endif
 #if defined(OS_WIN)
 #include "chrome/browser/net/service_providers_win.h"
@@ -1491,10 +1493,12 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
   std::string error;
   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);
+  if (!cros_network->LoadOncNetworks(onc_blob, passcode,
+                                chromeos::onc::ONC_SOURCE_USER_IMPORT,
+                                false)) {  // allow web trust from policy
+    LOG(ERROR) << "Unable to load ONC.";
+    error = "Unable to load ONC configuration.";
+  }
 
   // Now that we've added the networks, we need to rescan them so they'll be
   // available from the menu more immediately.
@@ -1505,7 +1509,7 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
 }
 
 void NetInternalsMessageHandler::OnStoreDebugLogs(const ListValue* list) {
-  DCHECK(!list);
+  DCHECK(list);
   StoreDebugLogs(
       base::Bind(&NetInternalsMessageHandler::OnStoreDebugLogsCompleted,
                  AsWeakPtr()));