| Index: chromeos/dbus/fake_shill_manager_client.h
|
| diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h
|
| index 7f24ca209a1a417308fe4d11cb5a5bcb971bcf56..5a0591e4177c2096738e9f12912a8c4933f0dade 100644
|
| --- a/chromeos/dbus/fake_shill_manager_client.h
|
| +++ b/chromeos/dbus/fake_shill_manager_client.h
|
| @@ -29,97 +29,97 @@ class CHROMEOS_EXPORT FakeShillManagerClient
|
| virtual ~FakeShillManagerClient();
|
|
|
| // ShillManagerClient overrides
|
| - virtual void Init(dbus::Bus* bus) OVERRIDE;
|
| + virtual void Init(dbus::Bus* bus) override;
|
| virtual void AddPropertyChangedObserver(
|
| - ShillPropertyChangedObserver* observer) OVERRIDE;
|
| + ShillPropertyChangedObserver* observer) override;
|
| virtual void RemovePropertyChangedObserver(
|
| - ShillPropertyChangedObserver* observer) OVERRIDE;
|
| - virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE;
|
| + ShillPropertyChangedObserver* observer) override;
|
| + virtual void GetProperties(const DictionaryValueCallback& callback) override;
|
| virtual void GetNetworksForGeolocation(
|
| - const DictionaryValueCallback& callback) OVERRIDE;
|
| + const DictionaryValueCallback& callback) override;
|
| virtual void SetProperty(const std::string& name,
|
| const base::Value& value,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void RequestScan(const std::string& type,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void EnableTechnology(
|
| const std::string& type,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void DisableTechnology(
|
| const std::string& type,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void ConfigureService(
|
| const base::DictionaryValue& properties,
|
| const ObjectPathCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void ConfigureServiceForProfile(
|
| const dbus::ObjectPath& profile_path,
|
| const base::DictionaryValue& properties,
|
| const ObjectPathCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void GetService(
|
| const base::DictionaryValue& properties,
|
| const ObjectPathCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void VerifyDestination(const VerificationProperties& properties,
|
| const BooleanCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void VerifyAndEncryptCredentials(
|
| const VerificationProperties& properties,
|
| const std::string& service_path,
|
| const StringCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void VerifyAndEncryptData(
|
| const VerificationProperties& properties,
|
| const std::string& data,
|
| const StringCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void ConnectToBestServices(
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void AddWakeOnPacketConnection(
|
| const net::IPEndPoint& ip_connection,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void RemoveWakeOnPacketConnection(
|
| const net::IPEndPoint& ip_endpoint,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void RemoveAllWakeOnPacketConnections(
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
|
|
| - virtual ShillManagerClient::TestInterface* GetTestInterface() OVERRIDE;
|
| + virtual ShillManagerClient::TestInterface* GetTestInterface() override;
|
|
|
| // ShillManagerClient::TestInterface overrides.
|
| - virtual void AddDevice(const std::string& device_path) OVERRIDE;
|
| - virtual void RemoveDevice(const std::string& device_path) OVERRIDE;
|
| - virtual void ClearDevices() OVERRIDE;
|
| - virtual void AddTechnology(const std::string& type, bool enabled) OVERRIDE;
|
| - virtual void RemoveTechnology(const std::string& type) OVERRIDE;
|
| + virtual void AddDevice(const std::string& device_path) override;
|
| + virtual void RemoveDevice(const std::string& device_path) override;
|
| + virtual void ClearDevices() override;
|
| + virtual void AddTechnology(const std::string& type, bool enabled) override;
|
| + virtual void RemoveTechnology(const std::string& type) override;
|
| virtual void SetTechnologyInitializing(const std::string& type,
|
| - bool initializing) OVERRIDE;
|
| + bool initializing) override;
|
| virtual void AddGeoNetwork(const std::string& technology,
|
| - const base::DictionaryValue& network) OVERRIDE;
|
| - virtual void AddProfile(const std::string& profile_path) OVERRIDE;
|
| - virtual void ClearProperties() OVERRIDE;
|
| + const base::DictionaryValue& network) override;
|
| + virtual void AddProfile(const std::string& profile_path) override;
|
| + virtual void ClearProperties() override;
|
| virtual void SetManagerProperty(const std::string& key,
|
| - const base::Value& value) OVERRIDE;
|
| + const base::Value& value) override;
|
| virtual void AddManagerService(const std::string& service_path,
|
| - bool notify_observers) OVERRIDE;
|
| - virtual void RemoveManagerService(const std::string& service_path) OVERRIDE;
|
| - virtual void ClearManagerServices() OVERRIDE;
|
| + bool notify_observers) override;
|
| + virtual void RemoveManagerService(const std::string& service_path) override;
|
| + virtual void ClearManagerServices() override;
|
| virtual void ServiceStateChanged(const std::string& service_path,
|
| - const std::string& state) OVERRIDE;
|
| - virtual void SortManagerServices(bool notify) OVERRIDE;
|
| - virtual void SetupDefaultEnvironment() OVERRIDE;
|
| - virtual int GetInteractiveDelay() const OVERRIDE;
|
| + const std::string& state) override;
|
| + virtual void SortManagerServices(bool notify) override;
|
| + virtual void SetupDefaultEnvironment() override;
|
| + virtual int GetInteractiveDelay() const override;
|
| virtual void SetBestServiceToConnect(
|
| - const std::string& service_path) OVERRIDE;
|
| + const std::string& service_path) override;
|
|
|
| // Constants used for testing.
|
| static const char kFakeEthernetNetworkGuid[];
|
|
|