Merge FavoriteState into NetworkState

chromeos/dbus/fake_shill_device_client.h

 // Copyright 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_DBUS_FAKE_SHILL_DEVICE_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_SHILL_DEVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 70 matching lines @@
       const std::string& operation,
       const std::string& peer,
       const StringCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE;
 
   virtual ShillDeviceClient::TestInterface* GetTestInterface() OVERRIDE;
 
   // ShillDeviceClient::TestInterface overrides.
   virtual void AddDevice(const std::string& device_path,
                          const std::string& type,
-                         const std::string& object_path) OVERRIDE;
+                         const std::string& name) OVERRIDE;
   virtual void RemoveDevice(const std::string& device_path) OVERRIDE;
   virtual void ClearDevices() OVERRIDE;
   virtual void SetDeviceProperty(const std::string& device_path,
                                  const std::string& name,
                                  const base::Value& value) OVERRIDE;
   virtual std::string GetDevicePathForType(const std::string& type) OVERRIDE;
 
   void set_tdls_busy_count(int count) { tdls_busy_count_ = count; }
 
  private:
@@ skipping 22 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FakeShillDeviceClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeShillDeviceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FAKE_SHILL_DEVICE_CLIENT_H_