| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <map> | 5 #include <map> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/extensions/api/networking_private/networking_private_de
legate.h" | 10 #include "chrome/browser/extensions/api/networking_private/networking_private_de
legate.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 class TestDelegate : public KeyedService, | 34 class TestDelegate : public KeyedService, |
| 35 public NetworkingPrivateDelegate { | 35 public NetworkingPrivateDelegate { |
| 36 public: | 36 public: |
| 37 TestDelegate() : fail_(false) { | 37 TestDelegate() : fail_(false) { |
| 38 } | 38 } |
| 39 | 39 |
| 40 // Asynchronous methods | 40 // Asynchronous methods |
| 41 virtual void GetProperties(const std::string& guid, | 41 virtual void GetProperties(const std::string& guid, |
| 42 const DictionaryCallback& success_callback, | 42 const DictionaryCallback& success_callback, |
| 43 const FailureCallback& failure_callback) OVERRIDE { | 43 const FailureCallback& failure_callback) override { |
| 44 DictionaryResult(guid, success_callback, failure_callback); | 44 DictionaryResult(guid, success_callback, failure_callback); |
| 45 } | 45 } |
| 46 | 46 |
| 47 virtual void GetManagedProperties( | 47 virtual void GetManagedProperties( |
| 48 const std::string& guid, | 48 const std::string& guid, |
| 49 const DictionaryCallback& success_callback, | 49 const DictionaryCallback& success_callback, |
| 50 const FailureCallback& failure_callback) OVERRIDE { | 50 const FailureCallback& failure_callback) override { |
| 51 DictionaryResult(guid, success_callback, failure_callback); | 51 DictionaryResult(guid, success_callback, failure_callback); |
| 52 } | 52 } |
| 53 | 53 |
| 54 virtual void GetState(const std::string& guid, | 54 virtual void GetState(const std::string& guid, |
| 55 const DictionaryCallback& success_callback, | 55 const DictionaryCallback& success_callback, |
| 56 const FailureCallback& failure_callback) OVERRIDE { | 56 const FailureCallback& failure_callback) override { |
| 57 DictionaryResult(guid, success_callback, failure_callback); | 57 DictionaryResult(guid, success_callback, failure_callback); |
| 58 } | 58 } |
| 59 | 59 |
| 60 | 60 |
| 61 virtual void SetProperties(const std::string& guid, | 61 virtual void SetProperties(const std::string& guid, |
| 62 scoped_ptr<base::DictionaryValue> properties, | 62 scoped_ptr<base::DictionaryValue> properties, |
| 63 const VoidCallback& success_callback, | 63 const VoidCallback& success_callback, |
| 64 const FailureCallback& failure_callback) OVERRIDE { | 64 const FailureCallback& failure_callback) override { |
| 65 VoidResult(success_callback, failure_callback); | 65 VoidResult(success_callback, failure_callback); |
| 66 } | 66 } |
| 67 | 67 |
| 68 virtual void CreateNetwork(bool shared, | 68 virtual void CreateNetwork(bool shared, |
| 69 scoped_ptr<base::DictionaryValue> properties, | 69 scoped_ptr<base::DictionaryValue> properties, |
| 70 const StringCallback& success_callback, | 70 const StringCallback& success_callback, |
| 71 const FailureCallback& failure_callback) OVERRIDE { | 71 const FailureCallback& failure_callback) override { |
| 72 StringResult(success_callback, failure_callback); | 72 StringResult(success_callback, failure_callback); |
| 73 } | 73 } |
| 74 | 74 |
| 75 virtual void GetNetworks(const std::string& network_type, | 75 virtual void GetNetworks(const std::string& network_type, |
| 76 bool configured_only, | 76 bool configured_only, |
| 77 bool visible_only, | 77 bool visible_only, |
| 78 int limit, | 78 int limit, |
| 79 const NetworkListCallback& success_callback, | 79 const NetworkListCallback& success_callback, |
| 80 const FailureCallback& failure_callback) OVERRIDE { | 80 const FailureCallback& failure_callback) override { |
| 81 if (fail_) { | 81 if (fail_) { |
| 82 failure_callback.Run(kFailure); | 82 failure_callback.Run(kFailure); |
| 83 } else { | 83 } else { |
| 84 scoped_ptr<base::ListValue> result(new base::ListValue); | 84 scoped_ptr<base::ListValue> result(new base::ListValue); |
| 85 scoped_ptr<base::DictionaryValue> network(new base::DictionaryValue); | 85 scoped_ptr<base::DictionaryValue> network(new base::DictionaryValue); |
| 86 network->SetString(::onc::network_config::kType, | 86 network->SetString(::onc::network_config::kType, |
| 87 ::onc::network_config::kEthernet); | 87 ::onc::network_config::kEthernet); |
| 88 network->SetString(::onc::network_config::kGUID, kGuid); | 88 network->SetString(::onc::network_config::kGUID, kGuid); |
| 89 result->Append(network.release()); | 89 result->Append(network.release()); |
| 90 success_callback.Run(result.Pass()); | 90 success_callback.Run(result.Pass()); |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 | 93 |
| 94 virtual void StartConnect(const std::string& guid, | 94 virtual void StartConnect(const std::string& guid, |
| 95 const VoidCallback& success_callback, | 95 const VoidCallback& success_callback, |
| 96 const FailureCallback& failure_callback) OVERRIDE { | 96 const FailureCallback& failure_callback) override { |
| 97 VoidResult(success_callback, failure_callback); | 97 VoidResult(success_callback, failure_callback); |
| 98 } | 98 } |
| 99 | 99 |
| 100 virtual void StartDisconnect( | 100 virtual void StartDisconnect( |
| 101 const std::string& guid, | 101 const std::string& guid, |
| 102 const VoidCallback& success_callback, | 102 const VoidCallback& success_callback, |
| 103 const FailureCallback& failure_callback) OVERRIDE { | 103 const FailureCallback& failure_callback) override { |
| 104 VoidResult(success_callback, failure_callback); | 104 VoidResult(success_callback, failure_callback); |
| 105 } | 105 } |
| 106 | 106 |
| 107 virtual void VerifyDestination( | 107 virtual void VerifyDestination( |
| 108 const VerificationProperties& verification_properties, | 108 const VerificationProperties& verification_properties, |
| 109 const BoolCallback& success_callback, | 109 const BoolCallback& success_callback, |
| 110 const FailureCallback& failure_callback) OVERRIDE { | 110 const FailureCallback& failure_callback) override { |
| 111 BoolResult(success_callback, failure_callback); | 111 BoolResult(success_callback, failure_callback); |
| 112 } | 112 } |
| 113 | 113 |
| 114 virtual void VerifyAndEncryptCredentials( | 114 virtual void VerifyAndEncryptCredentials( |
| 115 const std::string& guid, | 115 const std::string& guid, |
| 116 const VerificationProperties& verification_properties, | 116 const VerificationProperties& verification_properties, |
| 117 const StringCallback& success_callback, | 117 const StringCallback& success_callback, |
| 118 const FailureCallback& failure_callback) OVERRIDE { | 118 const FailureCallback& failure_callback) override { |
| 119 StringResult(success_callback, failure_callback); | 119 StringResult(success_callback, failure_callback); |
| 120 } | 120 } |
| 121 | 121 |
| 122 virtual void VerifyAndEncryptData( | 122 virtual void VerifyAndEncryptData( |
| 123 const VerificationProperties& verification_properties, | 123 const VerificationProperties& verification_properties, |
| 124 const std::string& data, | 124 const std::string& data, |
| 125 const StringCallback& success_callback, | 125 const StringCallback& success_callback, |
| 126 const FailureCallback& failure_callback) OVERRIDE { | 126 const FailureCallback& failure_callback) override { |
| 127 StringResult(success_callback, failure_callback); | 127 StringResult(success_callback, failure_callback); |
| 128 } | 128 } |
| 129 | 129 |
| 130 virtual void SetWifiTDLSEnabledState( | 130 virtual void SetWifiTDLSEnabledState( |
| 131 const std::string& ip_or_mac_address, | 131 const std::string& ip_or_mac_address, |
| 132 bool enabled, | 132 bool enabled, |
| 133 const StringCallback& success_callback, | 133 const StringCallback& success_callback, |
| 134 const FailureCallback& failure_callback) OVERRIDE { | 134 const FailureCallback& failure_callback) override { |
| 135 StringResult(success_callback, failure_callback); | 135 StringResult(success_callback, failure_callback); |
| 136 } | 136 } |
| 137 | 137 |
| 138 virtual void GetWifiTDLSStatus( | 138 virtual void GetWifiTDLSStatus( |
| 139 const std::string& ip_or_mac_address, | 139 const std::string& ip_or_mac_address, |
| 140 const StringCallback& success_callback, | 140 const StringCallback& success_callback, |
| 141 const FailureCallback& failure_callback) OVERRIDE { | 141 const FailureCallback& failure_callback) override { |
| 142 StringResult(success_callback, failure_callback); | 142 StringResult(success_callback, failure_callback); |
| 143 } | 143 } |
| 144 | 144 |
| 145 virtual void GetCaptivePortalStatus( | 145 virtual void GetCaptivePortalStatus( |
| 146 const std::string& guid, | 146 const std::string& guid, |
| 147 const StringCallback& success_callback, | 147 const StringCallback& success_callback, |
| 148 const FailureCallback& failure_callback) OVERRIDE { | 148 const FailureCallback& failure_callback) override { |
| 149 StringResult(success_callback, failure_callback); | 149 StringResult(success_callback, failure_callback); |
| 150 } | 150 } |
| 151 | 151 |
| 152 // Synchronous methods | 152 // Synchronous methods |
| 153 virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() OVERRIDE { | 153 virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override { |
| 154 scoped_ptr<base::ListValue> result; | 154 scoped_ptr<base::ListValue> result; |
| 155 if (!fail_) { | 155 if (!fail_) { |
| 156 result.reset(new base::ListValue); | 156 result.reset(new base::ListValue); |
| 157 result->AppendString(::onc::network_config::kEthernet); | 157 result->AppendString(::onc::network_config::kEthernet); |
| 158 } | 158 } |
| 159 return result.Pass(); | 159 return result.Pass(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 virtual bool EnableNetworkType(const std::string& type) OVERRIDE{ | 162 virtual bool EnableNetworkType(const std::string& type) override{ |
| 163 enabled_[type] = true; | 163 enabled_[type] = true; |
| 164 return !fail_; | 164 return !fail_; |
| 165 } | 165 } |
| 166 | 166 |
| 167 virtual bool DisableNetworkType(const std::string& type) OVERRIDE { | 167 virtual bool DisableNetworkType(const std::string& type) override { |
| 168 disabled_[type] = true; | 168 disabled_[type] = true; |
| 169 return !fail_; | 169 return !fail_; |
| 170 } | 170 } |
| 171 | 171 |
| 172 virtual bool RequestScan() OVERRIDE { | 172 virtual bool RequestScan() override { |
| 173 scan_requested_.push_back(true); | 173 scan_requested_.push_back(true); |
| 174 return !fail_; | 174 return !fail_; |
| 175 } | 175 } |
| 176 | 176 |
| 177 void set_fail(bool fail) { fail_ = fail; } | 177 void set_fail(bool fail) { fail_ = fail; } |
| 178 bool GetEnabled(const std::string& type) { return enabled_[type]; } | 178 bool GetEnabled(const std::string& type) { return enabled_[type]; } |
| 179 bool GetDisabled(const std::string& type) { return disabled_[type]; } | 179 bool GetDisabled(const std::string& type) { return disabled_[type]; } |
| 180 size_t GetScanRequested() { return scan_requested_.size(); } | 180 size_t GetScanRequested() { return scan_requested_.size(); } |
| 181 | 181 |
| 182 private: | 182 private: |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 if (!s_test_delegate_) | 233 if (!s_test_delegate_) |
| 234 s_test_delegate_ = new TestDelegate; | 234 s_test_delegate_ = new TestDelegate; |
| 235 } | 235 } |
| 236 | 236 |
| 237 static KeyedService* GetNetworkingPrivateDelegate( | 237 static KeyedService* GetNetworkingPrivateDelegate( |
| 238 content::BrowserContext* profile) { | 238 content::BrowserContext* profile) { |
| 239 CHECK(s_test_delegate_); | 239 CHECK(s_test_delegate_); |
| 240 return s_test_delegate_; | 240 return s_test_delegate_; |
| 241 } | 241 } |
| 242 | 242 |
| 243 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 243 virtual void SetUpCommandLine(CommandLine* command_line) override { |
| 244 ExtensionApiTest::SetUpCommandLine(command_line); | 244 ExtensionApiTest::SetUpCommandLine(command_line); |
| 245 // Whitelist the extension ID of the test extension. | 245 // Whitelist the extension ID of the test extension. |
| 246 command_line->AppendSwitchASCII( | 246 command_line->AppendSwitchASCII( |
| 247 extensions::switches::kWhitelistedExtensionID, | 247 extensions::switches::kWhitelistedExtensionID, |
| 248 "epcifkihnkjgphfkloaaleeakhpmgdmn"); | 248 "epcifkihnkjgphfkloaaleeakhpmgdmn"); |
| 249 } | 249 } |
| 250 | 250 |
| 251 virtual void SetUpOnMainThread() OVERRIDE { | 251 virtual void SetUpOnMainThread() override { |
| 252 ExtensionApiTest::SetUpOnMainThread(); | 252 ExtensionApiTest::SetUpOnMainThread(); |
| 253 #if defined(OS_CHROMEOS) | 253 #if defined(OS_CHROMEOS) |
| 254 NetworkingPrivateChromeOSFactory::GetInstance()->SetTestingFactory( | 254 NetworkingPrivateChromeOSFactory::GetInstance()->SetTestingFactory( |
| 255 profile(), | 255 profile(), |
| 256 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); | 256 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); |
| 257 #else | 257 #else |
| 258 NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory( | 258 NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory( |
| 259 profile(), | 259 profile(), |
| 260 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); | 260 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); |
| 261 #endif | 261 #endif |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; | 461 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; |
| 462 } | 462 } |
| 463 | 463 |
| 464 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { | 464 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { |
| 465 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; | 465 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; |
| 466 } | 466 } |
| 467 | 467 |
| 468 #endif // defined(OS_WIN) | 468 #endif // defined(OS_WIN) |
| 469 | 469 |
| 470 } // namespace extensions | 470 } // namespace extensions |
| OLD | NEW |