| Index: chrome/browser/local_discovery/wifi/mock_wifi_manager.h
|
| diff --git a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
|
| index 589abe7d5b8c80d70b62f55d18711c98a9cec3c7..80cecb3fd6c7683bc8f032cf4159a6eaa00c409d 100644
|
| --- a/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
|
| +++ b/chrome/browser/local_discovery/wifi/mock_wifi_manager.h
|
| @@ -20,7 +20,7 @@ class MockWifiManager : public WifiManager {
|
|
|
| MOCK_METHOD0(Start, void());
|
|
|
| - virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE;
|
| + virtual void GetSSIDList(const SSIDListCallback& callback) override;
|
|
|
| MOCK_METHOD0(GetSSIDListInternal, void());
|
|
|
| @@ -31,7 +31,7 @@ class MockWifiManager : public WifiManager {
|
| virtual void ConfigureAndConnectNetwork(
|
| const std::string& ssid,
|
| const WifiCredentials& credentials,
|
| - const SuccessCallback& callback) OVERRIDE;
|
| + const SuccessCallback& callback) override;
|
|
|
| MOCK_METHOD2(ConfigureAndConnectNetworkInternal,
|
| void(const std::string& ssid, const std::string& password));
|
| @@ -39,7 +39,7 @@ class MockWifiManager : public WifiManager {
|
| void CallConfigureAndConnectNetworkCallback(bool success);
|
|
|
| virtual void ConnectToNetworkByID(const std::string& internal_id,
|
| - const SuccessCallback& callback) OVERRIDE;
|
| + const SuccessCallback& callback) override;
|
|
|
| MOCK_METHOD1(ConnectToNetworkByIDInternal,
|
| void(const std::string& internal_id));
|
| @@ -48,7 +48,7 @@ class MockWifiManager : public WifiManager {
|
|
|
| virtual void RequestNetworkCredentials(
|
| const std::string& internal_id,
|
| - const CredentialsCallback& callback) OVERRIDE;
|
| + const CredentialsCallback& callback) override;
|
|
|
| MOCK_METHOD1(RequestNetworkCredentialsInternal,
|
| void(const std::string& internal_id));
|
| @@ -78,7 +78,7 @@ class MockWifiManagerFactory : public WifiManagerFactory {
|
| MockWifiManagerFactory();
|
| virtual ~MockWifiManagerFactory();
|
|
|
| - virtual scoped_ptr<WifiManager> CreateWifiManager() OVERRIDE;
|
| + virtual scoped_ptr<WifiManager> CreateWifiManager() override;
|
|
|
| MockWifiManager* GetLastCreatedWifiManager();
|
|
|
|
|