Remove additional dependencies from InternetOptionsHandler

chromeos/network/network_state.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/values.h"
 #include "chromeos/network/managed_state.h"
-#include "chromeos/network/network_ui_data.h"
 #include "components/onc/onc_constants.h"
 #include "url/gurl.h"
 
 namespace base {
 class DictionaryValue;
 class Value;
 }
 
 namespace chromeos {
 
@@ skipping 32 matching lines @@
   const std::string& device_path() const { return device_path_; }
   const std::string& guid() const { return guid_; }
   const std::string& profile_path() const { return profile_path_; }
   const std::string& error() const { return error_; }
   const std::string& last_error() const { return last_error_; }
   void clear_last_error() { last_error_.clear(); }
 
   // Returns |connection_state_| if visible, kStateDisconnect otherwise.
   std::string connection_state() const;
 
-  const NetworkUIData& ui_data() const { return ui_data_; }

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

Yeah!!! Defeating the beast finally :-)

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

Acknowledged.

   const base::DictionaryValue& proxy_config() const { return proxy_config_; }
 
   // IPConfig Properties. These require an extra call to ShillIPConfigClient,
   // so cache them to avoid excessively complex client code.
   const std::string& ip_address() const { return ip_address_; }
   const std::string& gateway() const { return gateway_; }
   const std::vector<std::string>& dns_servers() const { return dns_servers_; }
   const GURL& web_proxy_auto_discovery_url() const {
     return web_proxy_auto_discovery_url_;
   }
@@ skipping 72 matching lines @@
   bool connectable_;
 
   // Reflects the current Shill Service.Error property. This might get cleared
   // by Shill shortly after a failure.
   std::string error_;
 
   // Last non empty Service.Error property. Cleared by NetworkConnectionHandler
   // when a connection attempt is initiated.
   std::string last_error_;
 
-  // This is convenient to keep cached for now, but shouldn't be necessary;
-  // avoid using it if possible.
-  NetworkUIData ui_data_;
-
   // IPConfig properties.
   // Note: These do not correspond to actual Shill.Service properties
   // but are derived from the service's corresponding IPConfig object.
   std::string ip_address_;
   std::string gateway_;
   std::vector<std::string> dns_servers_;
   int prefix_length_;  // Used by GetNetmask()
   GURL web_proxy_auto_discovery_url_;
 
   // Wireless properties, used for icons and Connect logic.
@@ skipping 13 matching lines @@
   // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
   // provides proxy configuration. crbug.com/241775
   base::DictionaryValue proxy_config_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_