Merge FavoriteState into NetworkState

chromeos/network/managed_network_configuration_handler_unittest.cc

 // 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.
 
 #include <iostream>
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 116 matching lines @@
   }
 
  protected:
   base::DictionaryValue profile_entries_;
   std::map<std::string, std::string> profile_to_user_;
 };
 
 class TestNetworkProfileHandler : public NetworkProfileHandler {
  public:
   TestNetworkProfileHandler() {
-    Init(NULL /* No NetworkStateHandler */);
+    Init();
   }
   virtual ~TestNetworkProfileHandler() {}
 
   void AddProfileForTest(const NetworkProfile& profile) {
     AddProfile(profile);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestNetworkProfileHandler);
 };
@@ skipping 570 matching lines @@
 
   EXPECT_CALL(*mock_profile_client_,
               GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
 
   SetPolicy(::onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc");
   managed_network_configuration_handler_.reset();
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos