Remove unused ManagedState::is_observed_ property

This is some code cleanup in preparation of adding a FavoriteState.

We used to only observe watched services, however this caused problems
so the logic was changed, but the property was not removed.

A side effect of not removing the property is that RequestProperties
was getting called twice when a service is added to Services, once from
ShillPropertyHandler and once from NetworkStateHandler. The effect is
a no-op since RequestProperties checks for pending updates, but it makes
the code more confusing.

BUG=251922
R=gauravsh@chromium.org, pneubeck@chromium.org

Review URL: https://codereview.chromium.org/18031008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209176 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 20 deletions

diff --git a/chromeos/network/managed_state.cc b/chromeos/network/managed_state.cc
index d7e6a15..340b858 100644
--- a/chromeos/network/managed_state.cc
+++ b/chromeos/network/managed_state.cc
@@ -16,7 +16,6 @@ namespace chromeos {
 ManagedState::ManagedState(ManagedType type, const std::string& path)
     : managed_type_(type),
       path_(path),
-      is_observed_(false),
       update_requested_(false) {
 }
 
diff --git a/chromeos/network/managed_state.h b/chromeos/network/managed_state.h
index f128edc..4374e3c 100644
--- a/chromeos/network/managed_state.h
+++ b/chromeos/network/managed_state.h
@@ -60,8 +60,6 @@ class ManagedState {
   const std::string& path() const { return path_; }
   const std::string& name() const { return name_; }
   const std::string& type() const { return type_; }
-  bool is_observed() const { return is_observed_; }
-  void set_is_observed(bool is_observed) { is_observed_ = is_observed; }
   bool update_requested() const { return update_requested_; }
   void set_update_requested(bool update_requested) {
     update_requested_ = update_requested;
@@ -100,9 +98,6 @@ class ManagedState {
   std::string name_;  // flimflam::kNameProperty
   std::string type_;  // flimflam::kTypeProperty
 
-  // Tracks when the state is being observed.
-  bool is_observed_;
-
   // Tracks when an update has been requested.
   bool update_requested_;
 
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 3e7ce3d..05807fd 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -360,24 +360,15 @@ void NetworkStateHandler::UpdateManagedList(ManagedState::ManagedType type,
     DCHECK(!path.empty());
     std::map<std::string, ManagedState*>::iterator found =
         managed_map.find(path);
-    bool request_properties = false;
     ManagedState* managed;
-    bool is_observing = shill_property_handler_->IsObservingNetwork(path);
     if (found == managed_map.end()) {
-      request_properties = true;
       managed = ManagedState::Create(type, path);
       managed_list->push_back(managed);
     } else {
       managed = found->second;
       managed_list->push_back(managed);
       managed_map.erase(found);
-      if (!managed->is_observed() && is_observing)
-        request_properties = true;
     }
-    if (is_observing)
-      managed->set_is_observed(true);
-    if (request_properties)
-      shill_property_handler_->RequestProperties(type, path);
   }
   // Delete any remaning entries in managed_map.
   STLDeleteContainerPairSecondPointers(managed_map.begin(), managed_map.end());
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h
index 4ca119e..32f9f0a 100644
--- a/chromeos/network/shill_property_handler.h
+++ b/chromeos/network/shill_property_handler.h
@@ -120,11 +120,6 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   void RequestProperties(ManagedState::ManagedType type,
                          const std::string& path);
 
-  // Returns true if |service_path| is being observed.
-  bool IsObservingNetwork(const std::string& service_path) {
-    return observed_networks_.count(service_path) != 0;
-  }
-
   // ShillPropertyChangedObserver overrides
   virtual void OnPropertyChanged(const std::string& key,
                                  const base::Value& value) OVERRIDE;