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

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 52 matching lines @@
 #include "net/base/transport_security_state.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_stream_factory.h"
 #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"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #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"
 #endif
 
 using base::PassPlatformFile;
 using base::PlatformFile;
 using base::PlatformFileError;
 using content::BrowserThread;
 using content::WebContents;
@@ skipping 1390 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 log_error;
   chromeos::NetworkLibrary* cros_network =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-  cros_network->LoadOncNetworks(onc_blob, passcode,
-                                chromeos::NetworkUIData::ONC_SOURCE_USER_IMPORT,
+  if (!cros_network->LoadOncNetworks(onc_blob, passcode,

[pneubeck (no reviews), 2012/12/04 10:43:56]

We should also forwards warnings in the case of LoadOncNetworks returning true.

See also my (abandoned) change in
https://codereview.chromium.org/11415148/patch/6035/8035

[Greg Spencer (Chromium), 2012/12/07 18:12:27]

Logging now goes to network logging interface, including warnings.

+                                chromeos::onc::ONC_SOURCE_USER_IMPORT,
                                 false,  // allow_web_trust_from_policy
-                                &error);
+                                &log_error)) {
+    LOG(ERROR) << "Unable to load ONC blob: " << log_error;

[pneubeck (no reviews), 2012/12/04 10:43:56]

no need to log |log_error|...

[Greg Spencer (Chromium), 2012/12/07 18:12:27]

Done.

+    error = l10n_util::GetStringUTF8(
+        IDS_NETWORK_CONFIG_ERROR_UNABLE_TO_LOAD_ONC);

[pneubeck (no reviews), 2012/12/04 10:43:56]

Actually, l10n isn't needed for net-internals. None of it is translated and it's
an "internal" page.

[Greg Spencer (Chromium), 2012/12/07 18:12:27]

Done.

+  }
 
   // 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));
 }
 
 void NetInternalsMessageHandler::OnStoreDebugLogs(const ListValue* list) {
@@ skipping 402 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());
 }