Merge FavoriteState into NetworkState

chromeos/network/network_profile_handler.h

 // Copyright (c) 2013 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_PROFILE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 48 matching lines @@
 
   static std::string GetSharedProfilePath();
 
  protected:
   friend class ClientCertResolverTest;
   friend class NetworkConnectionHandlerTest;
   friend class NetworkHandler;
   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_;
 
   // For Shill client callbacks
   base::WeakPtrFactory<NetworkProfileHandler> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkProfileHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_