Set onc_source UI data parameter when importing ONC.

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2011 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/chromeos/cros/network_library.h"
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-gtype-specialized.h>
 #include <glib-object.h>
 
@@ skipping 13 matching lines @@
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversion_utils.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
-#include "chrome/browser/chromeos/cros/network_ui_data.h"
 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/network_login_observer.h"
 #include "chrome/common/time_format.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/nss_util.h"  // crypto::GetTPMTokenInfo() for 802.1X and VPN.
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 1693 matching lines @@
   // virtual DisconnectFromNetwork implemented in derived classes.
   virtual void ForgetNetwork(const std::string& service_path) OVERRIDE;
   virtual void EnableEthernetNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableWifiNetworkDevice(bool enable) OVERRIDE;
   virtual void EnableCellularNetworkDevice(bool enable) OVERRIDE;
   // virtual EnableOfflineMode implemented in derived classes.
   // virtual GetIPConfigs implemented in derived classes.
   // virtual SetIPConfig implemented in derived classes.
   virtual void SwitchToPreferredNetwork() OVERRIDE;
   virtual bool LoadOncNetworks(const std::string& onc_blob,
-                               const std::string& passcode) OVERRIDE;
+                               const std::string& passcode,
+                               NetworkUIData::ONCSource source) OVERRIDE;
   virtual bool SetActiveNetwork(ConnectionType type,
                                 const std::string& service_path) OVERRIDE;
 
  protected:
   typedef ObserverList<NetworkObserver> NetworkObserverList;
   typedef std::map<std::string, NetworkObserverList*> NetworkObserverMap;
 
   typedef ObserverList<NetworkDeviceObserver> NetworkDeviceObserverList;
   typedef std::map<std::string, NetworkDeviceObserverList*>
       NetworkDeviceObserverMap;
@@ skipping 1068 matching lines @@
     if (!wifi->preferred())  // All preferred networks are sorted in front.
       break;
     if (wifi->auto_connect()) {
       ConnectToWifiNetwork(wifi);
       break;
     }
   }
 }
 
 bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
-                                             const std::string& passcode) {
+                                             const std::string& passcode,
+                                             NetworkUIData::ONCSource source) {
   // TODO(gspencer): Add support for decrypting onc files. crbug.com/19397
-  OncNetworkParser parser(onc_blob);
+  OncNetworkParser parser(onc_blob, source);
 
   for (int i = 0; i < parser.GetCertificatesSize(); i++) {
     // Insert each of the available certs into the certificate DB.
     if (parser.ParseCertificate(i).get() == NULL) {
       DLOG(WARNING) << "Cannot parse certificate in ONC file";
       return false;
     }
   }
 
   for (int i = 0; i < parser.GetNetworkConfigsSize(); i++) {
@@ skipping 2245 matching lines @@
         "      \"GUID\": \"guid\","
         "      \"Type\": \"WiFi\","
         "      \"WiFi\": {"
         "        \"Security\": \"WEP\","
         "        \"SSID\": \"MySSID\","
         "      }"
         "    }"
         "  ],"
         "  \"Certificates\": []"
         "}");
-  LoadOncNetworks(test_blob, "");
+  LoadOncNetworks(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // NetworkLibraryImplStub private methods.
 
 void NetworkLibraryImplStub::AddStubNetwork(
     Network* network, NetworkProfileType profile_type) {
   network->priority_order_ = network_priority_order_++;
   network->CalculateUniqueId();
   if (!network->unique_id().empty())
@@ skipping 227 matching lines @@
   return impl;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until its last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);