Use networkingPrivate.startConnect

chromeos/network/onc/onc_translator_shill_to_onc.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 "chromeos/network/onc/onc_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace onc {
 
@@ skipping 10 matching lines @@
     value = base::JSONReader::Read(str);
   }
 
   if (value == NULL || value->GetType() != type) {
     delete value;
     value = NULL;
   }
   return make_scoped_ptr(value);
 }
 
+const NetworkState* GetNetworkStateFromGuid(const std::string& guid) {
+  if (!NetworkHandler::IsInitialized())

[pneubeck (no reviews), 2015/04/14 09:32:16]

This is not explicit though.
If at all, please pass in the dependency explicitly.
Less dependency in form of a NetworkState argument is very much preferable over
the huge dependency on NSH, which is much much harder to fake/mock in tests.

+    return nullptr;
+  return NetworkHandler::Get()
+      ->network_state_handler()
+      ->GetNetworkStateFromGuid(guid);
+}
+
 // This class implements the translation of properties from the given
 // |shill_dictionary| to a new ONC object of signature |onc_signature|. Using
 // recursive calls to CreateTranslatedONCObject of new instances, nested objects
 // are translated.
 class ShillToONCTranslator {
  public:
   ShillToONCTranslator(const base::DictionaryValue& shill_dictionary,
                        ::onc::ONCSource onc_source,
                        const OncValueSignature& onc_signature)
       : shill_dictionary_(&shill_dictionary),
@@ skipping 410 matching lines @@
     }
     onc_object_->SetStringWithoutPathExpansion(
         ::onc::network_config::kConnectionState, onc_state);
     // Only set 'RestrictedConnectivity' if captive portal state is true.
     if (NetworkState::NetworkStateIsCaptivePortal(*shill_dictionary_)) {
       onc_object_->SetBooleanWithoutPathExpansion(
           ::onc::network_config::kRestrictedConnectivity, true);
     }
   }
 
+  // 'ErrorState' reflects the most recent error maintained in NetworkState
+  // (which may not match Shill's Error or PreviousError properties). Non
+  // visible networks (with no NetworkState) do not set ErrorState.
+  std::string guid;
+  if (shill_dictionary_->GetStringWithoutPathExpansion(shill::kGuidProperty,
+                                                       &guid)) {
+    const NetworkState* network_state = GetNetworkStateFromGuid(guid);
+    if (network_state) {
+      onc_object_->SetStringWithoutPathExpansion(
+          ::onc::network_config::kErrorState, network_state->GetErrorState());
+    }
+  }
+
   std::string profile_path;
   if (onc_source_ != ::onc::ONC_SOURCE_UNKNOWN &&
       shill_dictionary_->GetStringWithoutPathExpansion(shill::kProfileProperty,
                                                        &profile_path)) {
     std::string source;
     if (onc_source_ == ::onc::ONC_SOURCE_DEVICE_POLICY)
       source = ::onc::network_config::kSourceDevicePolicy;
     else if (onc_source_ == ::onc::ONC_SOURCE_USER_POLICY)
       source = ::onc::network_config::kSourceUserPolicy;
     else if (profile_path == NetworkProfileHandler::GetSharedProfilePath())
@@ skipping 243 matching lines @@
     ::onc::ONCSource onc_source,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos