Merge FavoriteState into NetworkState

chromeos/network/network_profile_handler.h

Index: chromeos/network/network_profile_handler.h
diff --git a/chromeos/network/network_profile_handler.h b/chromeos/network/network_profile_handler.h
index a5c1d0ae8dcd81298870bbb305320dd5b8f19692..dcbbea925c4231c592088adddc19ad2d1797d3bb 100644
--- a/chromeos/network/network_profile_handler.h
+++ b/chromeos/network/network_profile_handler.h
@@ -66,14 +66,12 @@ class CHROMEOS_EXPORT NetworkProfileHandler
   NetworkProfileHandler();
 
   // Add ShillManagerClient property observer and request initial list.
-  // Sets |network_state_handler_| for triggering Manager updates (can be NULL).
-  void Init(NetworkStateHandler* network_state_handler);
+  void Init();
 
   void AddProfile(const NetworkProfile& profile);
   void RemoveProfile(const std::string& profile_path);
 
  private:
-  NetworkStateHandler* network_state_handler_;
   ProfileList profiles_;
   ObserverList<NetworkProfileObserver> observers_;