Remove additional dependencies from InternetOptionsHandler

chromeos/network/network_util.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/network_util.h"
 
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "chromeos/login/login_state.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "chromeos/network/onc/onc_translator.h"
+#include "chromeos/network/onc/onc_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 WifiAccessPoint::WifiAccessPoint()
     : signal_strength(0),
       signal_to_noise(0),
       channel(0) {
 }
 
@@ skipping 130 matching lines @@
 scoped_ptr<base::ListValue> TranslateNetworkListToONC(
     NetworkTypePattern pattern,
     bool configured_only,
     bool visible_only,
     int limit,
     bool debugging_properties) {
   NetworkStateHandler::NetworkStateList network_states;
   NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
       pattern, configured_only, visible_only, limit, &network_states);
 
+  std::string userhash = LoginState::Get()->primary_user_hash();

[pneubeck (no reviews), 2014/07/11 20:35:07]

It seems to me that this is unexpected and will eventually lead to surprises.
Could you pass in the user_hash instead of defaulting to the primary user (even
if it's conditionally required if debugging_properties=true)?

[stevenjb, 2014/07/11 21:26:10]

I'll rip this out for now, it's handy but not worth making a major change to
support at this point. We also have the "Get managed properties" checkbox now in
chrome://network.

+  ManagedNetworkConfigurationHandler* config_handler =
+      NetworkHandler::Get()->managed_network_configuration_handler();
+
   scoped_ptr<base::ListValue> network_properties_list(new base::ListValue);
   for (NetworkStateHandler::NetworkStateList::iterator it =
            network_states.begin();
        it != network_states.end();
        ++it) {
     scoped_ptr<base::DictionaryValue> onc_dictionary =
         TranslateNetworkStateToONC(*it);
 
     if (debugging_properties) {
       onc_dictionary->SetBoolean("connectable", (*it)->connectable());
       onc_dictionary->SetBoolean("visible", (*it)->visible());
       onc_dictionary->SetString("profile_path", (*it)->profile_path());
       onc_dictionary->SetString("service_path", (*it)->path());
-      std::string onc_source = (*it)->ui_data().GetONCSourceAsString();
-      if (!onc_source.empty())
-        onc_dictionary->SetString("onc_source", onc_source);
+      ::onc::ONCSource onc_source;
+      config_handler->FindPolicyByGUID(userhash, (*it)->guid(), &onc_source);
+      onc_dictionary->SetString("onc_source",
+                                onc::GetSourceAsString(onc_source));
     }
 
     network_properties_list->Append(onc_dictionary.release());
   }
   return network_properties_list.Pass();
 }
 
 std::string TranslateONCTypeToShill(const std::string& onc_type) {
   if (onc_type == ::onc::network_type::kEthernet)
     return shill::kTypeEthernet;
   std::string shill_type;
   onc::TranslateStringToShill(onc::kNetworkTypeTable, onc_type, &shill_type);
   return shill_type;
 }
 
 }  // namespace network_util
 }  // namespace chromeos