| Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
|
| index 07498452c9680aca35973d808c118f7bc091a0ad..8de32a50c9a191b09b94603f5a11bf5d84743262 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
|
| @@ -38,46 +38,44 @@ class TestDelegate : public KeyedService,
|
| }
|
|
|
| // Asynchronous methods
|
| - virtual void GetProperties(const std::string& guid,
|
| - const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void GetProperties(const std::string& guid,
|
| + const DictionaryCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| DictionaryResult(guid, success_callback, failure_callback);
|
| }
|
|
|
| - virtual void GetManagedProperties(
|
| - const std::string& guid,
|
| - const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void GetManagedProperties(const std::string& guid,
|
| + const DictionaryCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| DictionaryResult(guid, success_callback, failure_callback);
|
| }
|
|
|
| - virtual void GetState(const std::string& guid,
|
| - const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void GetState(const std::string& guid,
|
| + const DictionaryCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| DictionaryResult(guid, success_callback, failure_callback);
|
| }
|
|
|
| -
|
| - virtual void SetProperties(const std::string& guid,
|
| - scoped_ptr<base::DictionaryValue> properties,
|
| - const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void SetProperties(const std::string& guid,
|
| + scoped_ptr<base::DictionaryValue> properties,
|
| + const VoidCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| VoidResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void CreateNetwork(bool shared,
|
| - scoped_ptr<base::DictionaryValue> properties,
|
| - const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void CreateNetwork(bool shared,
|
| + scoped_ptr<base::DictionaryValue> properties,
|
| + const StringCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| StringResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void GetNetworks(const std::string& network_type,
|
| - bool configured_only,
|
| - bool visible_only,
|
| - int limit,
|
| - const NetworkListCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void GetNetworks(const std::string& network_type,
|
| + bool configured_only,
|
| + bool visible_only,
|
| + int limit,
|
| + const NetworkListCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| if (fail_) {
|
| failure_callback.Run(kFailure);
|
| } else {
|
| @@ -91,27 +89,25 @@ class TestDelegate : public KeyedService,
|
| }
|
| }
|
|
|
| - virtual void StartConnect(const std::string& guid,
|
| - const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void StartConnect(const std::string& guid,
|
| + const VoidCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| VoidResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void StartDisconnect(
|
| - const std::string& guid,
|
| - const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void StartDisconnect(const std::string& guid,
|
| + const VoidCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| VoidResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void VerifyDestination(
|
| - const VerificationProperties& verification_properties,
|
| - const BoolCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void VerifyDestination(const VerificationProperties& verification_properties,
|
| + const BoolCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| BoolResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void VerifyAndEncryptCredentials(
|
| + void VerifyAndEncryptCredentials(
|
| const std::string& guid,
|
| const VerificationProperties& verification_properties,
|
| const StringCallback& success_callback,
|
| @@ -119,7 +115,7 @@ class TestDelegate : public KeyedService,
|
| StringResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void VerifyAndEncryptData(
|
| + void VerifyAndEncryptData(
|
| const VerificationProperties& verification_properties,
|
| const std::string& data,
|
| const StringCallback& success_callback,
|
| @@ -127,7 +123,7 @@ class TestDelegate : public KeyedService,
|
| StringResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void SetWifiTDLSEnabledState(
|
| + void SetWifiTDLSEnabledState(
|
| const std::string& ip_or_mac_address,
|
| bool enabled,
|
| const StringCallback& success_callback,
|
| @@ -135,14 +131,13 @@ class TestDelegate : public KeyedService,
|
| StringResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void GetWifiTDLSStatus(
|
| - const std::string& ip_or_mac_address,
|
| - const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) override {
|
| + void GetWifiTDLSStatus(const std::string& ip_or_mac_address,
|
| + const StringCallback& success_callback,
|
| + const FailureCallback& failure_callback) override {
|
| StringResult(success_callback, failure_callback);
|
| }
|
|
|
| - virtual void GetCaptivePortalStatus(
|
| + void GetCaptivePortalStatus(
|
| const std::string& guid,
|
| const StringCallback& success_callback,
|
| const FailureCallback& failure_callback) override {
|
| @@ -150,7 +145,7 @@ class TestDelegate : public KeyedService,
|
| }
|
|
|
| // Synchronous methods
|
| - virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override {
|
| + scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override {
|
| scoped_ptr<base::ListValue> result;
|
| if (!fail_) {
|
| result.reset(new base::ListValue);
|
| @@ -159,17 +154,17 @@ class TestDelegate : public KeyedService,
|
| return result.Pass();
|
| }
|
|
|
| - virtual bool EnableNetworkType(const std::string& type) override{
|
| + bool EnableNetworkType(const std::string& type) override {
|
| enabled_[type] = true;
|
| return !fail_;
|
| }
|
|
|
| - virtual bool DisableNetworkType(const std::string& type) override {
|
| + bool DisableNetworkType(const std::string& type) override {
|
| disabled_[type] = true;
|
| return !fail_;
|
| }
|
|
|
| - virtual bool RequestScan() override {
|
| + bool RequestScan() override {
|
| scan_requested_.push_back(true);
|
| return !fail_;
|
| }
|
| @@ -240,7 +235,7 @@ class NetworkingPrivateApiTest : public ExtensionApiTest {
|
| return s_test_delegate_;
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| // Whitelist the extension ID of the test extension.
|
| command_line->AppendSwitchASCII(
|
| @@ -248,7 +243,7 @@ class NetworkingPrivateApiTest : public ExtensionApiTest {
|
| "epcifkihnkjgphfkloaaleeakhpmgdmn");
|
| }
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| ExtensionApiTest::SetUpOnMainThread();
|
| #if defined(OS_CHROMEOS)
|
| NetworkingPrivateChromeOSFactory::GetInstance()->SetTestingFactory(
|
|
|