Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 666153002: Standardize usage of virtual/override/final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 20 matching lines...) Expand all
31 const char kSuccess[] = "Success"; 31 const char kSuccess[] = "Success";
32 const char kGuid[] = "SOME_GUID"; 32 const char kGuid[] = "SOME_GUID";
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 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 void GetManagedProperties(const std::string& guid,
48 const std::string& guid, 48 const DictionaryCallback& success_callback,
49 const DictionaryCallback& success_callback, 49 const FailureCallback& failure_callback) override {
50 const FailureCallback& failure_callback) override {
51 DictionaryResult(guid, success_callback, failure_callback); 50 DictionaryResult(guid, success_callback, failure_callback);
52 } 51 }
53 52
54 virtual void GetState(const std::string& guid, 53 void GetState(const std::string& guid,
55 const DictionaryCallback& success_callback, 54 const DictionaryCallback& success_callback,
56 const FailureCallback& failure_callback) override { 55 const FailureCallback& failure_callback) override {
57 DictionaryResult(guid, success_callback, failure_callback); 56 DictionaryResult(guid, success_callback, failure_callback);
58 } 57 }
59 58
60 59 void SetProperties(const std::string& guid,
61 virtual void SetProperties(const std::string& guid, 60 scoped_ptr<base::DictionaryValue> properties,
62 scoped_ptr<base::DictionaryValue> properties, 61 const VoidCallback& success_callback,
63 const VoidCallback& success_callback, 62 const FailureCallback& failure_callback) override {
64 const FailureCallback& failure_callback) override {
65 VoidResult(success_callback, failure_callback); 63 VoidResult(success_callback, failure_callback);
66 } 64 }
67 65
68 virtual void CreateNetwork(bool shared, 66 void CreateNetwork(bool shared,
69 scoped_ptr<base::DictionaryValue> properties, 67 scoped_ptr<base::DictionaryValue> properties,
70 const StringCallback& success_callback, 68 const StringCallback& success_callback,
71 const FailureCallback& failure_callback) override { 69 const FailureCallback& failure_callback) override {
72 StringResult(success_callback, failure_callback); 70 StringResult(success_callback, failure_callback);
73 } 71 }
74 72
75 virtual void GetNetworks(const std::string& network_type, 73 void GetNetworks(const std::string& network_type,
76 bool configured_only, 74 bool configured_only,
77 bool visible_only, 75 bool visible_only,
78 int limit, 76 int limit,
79 const NetworkListCallback& success_callback, 77 const NetworkListCallback& success_callback,
80 const FailureCallback& failure_callback) override { 78 const FailureCallback& failure_callback) override {
81 if (fail_) { 79 if (fail_) {
82 failure_callback.Run(kFailure); 80 failure_callback.Run(kFailure);
83 } else { 81 } else {
84 scoped_ptr<base::ListValue> result(new base::ListValue); 82 scoped_ptr<base::ListValue> result(new base::ListValue);
85 scoped_ptr<base::DictionaryValue> network(new base::DictionaryValue); 83 scoped_ptr<base::DictionaryValue> network(new base::DictionaryValue);
86 network->SetString(::onc::network_config::kType, 84 network->SetString(::onc::network_config::kType,
87 ::onc::network_config::kEthernet); 85 ::onc::network_config::kEthernet);
88 network->SetString(::onc::network_config::kGUID, kGuid); 86 network->SetString(::onc::network_config::kGUID, kGuid);
89 result->Append(network.release()); 87 result->Append(network.release());
90 success_callback.Run(result.Pass()); 88 success_callback.Run(result.Pass());
91 } 89 }
92 } 90 }
93 91
94 virtual void StartConnect(const std::string& guid, 92 void StartConnect(const std::string& guid,
95 const VoidCallback& success_callback, 93 const VoidCallback& success_callback,
96 const FailureCallback& failure_callback) override { 94 const FailureCallback& failure_callback) override {
97 VoidResult(success_callback, failure_callback); 95 VoidResult(success_callback, failure_callback);
98 } 96 }
99 97
100 virtual void StartDisconnect( 98 void StartDisconnect(const std::string& guid,
101 const std::string& guid, 99 const VoidCallback& success_callback,
102 const VoidCallback& success_callback, 100 const FailureCallback& failure_callback) override {
103 const FailureCallback& failure_callback) override {
104 VoidResult(success_callback, failure_callback); 101 VoidResult(success_callback, failure_callback);
105 } 102 }
106 103
107 virtual void VerifyDestination( 104 void VerifyDestination(const VerificationProperties& verification_properties,
108 const VerificationProperties& verification_properties, 105 const BoolCallback& success_callback,
109 const BoolCallback& success_callback, 106 const FailureCallback& failure_callback) override {
110 const FailureCallback& failure_callback) override {
111 BoolResult(success_callback, failure_callback); 107 BoolResult(success_callback, failure_callback);
112 } 108 }
113 109
114 virtual void VerifyAndEncryptCredentials( 110 void VerifyAndEncryptCredentials(
115 const std::string& guid, 111 const std::string& guid,
116 const VerificationProperties& verification_properties, 112 const VerificationProperties& verification_properties,
117 const StringCallback& success_callback, 113 const StringCallback& success_callback,
118 const FailureCallback& failure_callback) override { 114 const FailureCallback& failure_callback) override {
119 StringResult(success_callback, failure_callback); 115 StringResult(success_callback, failure_callback);
120 } 116 }
121 117
122 virtual void VerifyAndEncryptData( 118 void VerifyAndEncryptData(
123 const VerificationProperties& verification_properties, 119 const VerificationProperties& verification_properties,
124 const std::string& data, 120 const std::string& data,
125 const StringCallback& success_callback, 121 const StringCallback& success_callback,
126 const FailureCallback& failure_callback) override { 122 const FailureCallback& failure_callback) override {
127 StringResult(success_callback, failure_callback); 123 StringResult(success_callback, failure_callback);
128 } 124 }
129 125
130 virtual void SetWifiTDLSEnabledState( 126 void SetWifiTDLSEnabledState(
131 const std::string& ip_or_mac_address, 127 const std::string& ip_or_mac_address,
132 bool enabled, 128 bool enabled,
133 const StringCallback& success_callback, 129 const StringCallback& success_callback,
134 const FailureCallback& failure_callback) override { 130 const FailureCallback& failure_callback) override {
135 StringResult(success_callback, failure_callback); 131 StringResult(success_callback, failure_callback);
136 } 132 }
137 133
138 virtual void GetWifiTDLSStatus( 134 void GetWifiTDLSStatus(const std::string& ip_or_mac_address,
139 const std::string& ip_or_mac_address, 135 const StringCallback& success_callback,
140 const StringCallback& success_callback, 136 const FailureCallback& failure_callback) override {
141 const FailureCallback& failure_callback) override {
142 StringResult(success_callback, failure_callback); 137 StringResult(success_callback, failure_callback);
143 } 138 }
144 139
145 virtual void GetCaptivePortalStatus( 140 void GetCaptivePortalStatus(
146 const std::string& guid, 141 const std::string& guid,
147 const StringCallback& success_callback, 142 const StringCallback& success_callback,
148 const FailureCallback& failure_callback) override { 143 const FailureCallback& failure_callback) override {
149 StringResult(success_callback, failure_callback); 144 StringResult(success_callback, failure_callback);
150 } 145 }
151 146
152 // Synchronous methods 147 // Synchronous methods
153 virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override { 148 scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override {
154 scoped_ptr<base::ListValue> result; 149 scoped_ptr<base::ListValue> result;
155 if (!fail_) { 150 if (!fail_) {
156 result.reset(new base::ListValue); 151 result.reset(new base::ListValue);
157 result->AppendString(::onc::network_config::kEthernet); 152 result->AppendString(::onc::network_config::kEthernet);
158 } 153 }
159 return result.Pass(); 154 return result.Pass();
160 } 155 }
161 156
162 virtual bool EnableNetworkType(const std::string& type) override{ 157 bool EnableNetworkType(const std::string& type) override {
163 enabled_[type] = true; 158 enabled_[type] = true;
164 return !fail_; 159 return !fail_;
165 } 160 }
166 161
167 virtual bool DisableNetworkType(const std::string& type) override { 162 bool DisableNetworkType(const std::string& type) override {
168 disabled_[type] = true; 163 disabled_[type] = true;
169 return !fail_; 164 return !fail_;
170 } 165 }
171 166
172 virtual bool RequestScan() override { 167 bool RequestScan() override {
173 scan_requested_.push_back(true); 168 scan_requested_.push_back(true);
174 return !fail_; 169 return !fail_;
175 } 170 }
176 171
177 void set_fail(bool fail) { fail_ = fail; } 172 void set_fail(bool fail) { fail_ = fail; }
178 bool GetEnabled(const std::string& type) { return enabled_[type]; } 173 bool GetEnabled(const std::string& type) { return enabled_[type]; }
179 bool GetDisabled(const std::string& type) { return disabled_[type]; } 174 bool GetDisabled(const std::string& type) { return disabled_[type]; }
180 size_t GetScanRequested() { return scan_requested_.size(); } 175 size_t GetScanRequested() { return scan_requested_.size(); }
181 176
182 private: 177 private:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 if (!s_test_delegate_) 228 if (!s_test_delegate_)
234 s_test_delegate_ = new TestDelegate; 229 s_test_delegate_ = new TestDelegate;
235 } 230 }
236 231
237 static KeyedService* GetNetworkingPrivateDelegate( 232 static KeyedService* GetNetworkingPrivateDelegate(
238 content::BrowserContext* profile) { 233 content::BrowserContext* profile) {
239 CHECK(s_test_delegate_); 234 CHECK(s_test_delegate_);
240 return s_test_delegate_; 235 return s_test_delegate_;
241 } 236 }
242 237
243 virtual void SetUpCommandLine(CommandLine* command_line) override { 238 void SetUpCommandLine(CommandLine* command_line) override {
244 ExtensionApiTest::SetUpCommandLine(command_line); 239 ExtensionApiTest::SetUpCommandLine(command_line);
245 // Whitelist the extension ID of the test extension. 240 // Whitelist the extension ID of the test extension.
246 command_line->AppendSwitchASCII( 241 command_line->AppendSwitchASCII(
247 extensions::switches::kWhitelistedExtensionID, 242 extensions::switches::kWhitelistedExtensionID,
248 "epcifkihnkjgphfkloaaleeakhpmgdmn"); 243 "epcifkihnkjgphfkloaaleeakhpmgdmn");
249 } 244 }
250 245
251 virtual void SetUpOnMainThread() override { 246 void SetUpOnMainThread() override {
252 ExtensionApiTest::SetUpOnMainThread(); 247 ExtensionApiTest::SetUpOnMainThread();
253 #if defined(OS_CHROMEOS) 248 #if defined(OS_CHROMEOS)
254 NetworkingPrivateChromeOSFactory::GetInstance()->SetTestingFactory( 249 NetworkingPrivateChromeOSFactory::GetInstance()->SetTestingFactory(
255 profile(), 250 profile(),
256 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); 251 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate);
257 #else 252 #else
258 NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory( 253 NetworkingPrivateServiceClientFactory::GetInstance()->SetTestingFactory(
259 profile(), 254 profile(),
260 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate); 255 &NetworkingPrivateApiTest::GetNetworkingPrivateDelegate);
261 #endif 256 #endif
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; 456 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_;
462 } 457 }
463 458
464 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { 459 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) {
465 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; 460 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_;
466 } 461 }
467 462
468 #endif // defined(OS_WIN) 463 #endif // defined(OS_WIN)
469 464
470 } // namespace extensions 465 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698