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

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

Issue 22295002: Base infrastructure for Networking Private API on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed (some) codereview comments. Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chromeos/login/user.h" 8 #include "chrome/browser/chromeos/login/user.h"
9 #include "chrome/browser/chromeos/login/user_manager.h" 9 #include "chrome/browser/chromeos/login/user_manager.h"
10 #include "chrome/browser/extensions/api/networking_private/networking_private_pr ocess_client.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/policy/browser_policy_connector.h" 12 #include "chrome/browser/policy/browser_policy_connector.h"
12 #include "chrome/browser/policy/external_data_fetcher.h" 13 #include "chrome/browser/policy/external_data_fetcher.h"
13 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 14 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
14 #include "chrome/browser/policy/policy_map.h" 15 #include "chrome/browser/policy/policy_map.h"
15 #include "chrome/browser/policy/policy_types.h" 16 #include "chrome/browser/policy/policy_types.h"
16 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
17 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
18 19
19 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 205 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
205 ExtensionApiTest::SetUpCommandLine(command_line); 206 ExtensionApiTest::SetUpCommandLine(command_line);
206 // Whitelist the extension ID of the test extension. 207 // Whitelist the extension ID of the test extension.
207 command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID, 208 command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID,
208 "epcifkihnkjgphfkloaaleeakhpmgdmn"); 209 "epcifkihnkjgphfkloaaleeakhpmgdmn");
209 } 210 }
210 211
211 virtual void SetUpOnMainThread() OVERRIDE { 212 virtual void SetUpOnMainThread() OVERRIDE {
212 ExtensionApiTest::SetUpOnMainThread(); 213 ExtensionApiTest::SetUpOnMainThread();
213 content::RunAllPendingInMessageLoop(); 214 content::RunAllPendingInMessageLoop();
215 base::DictionaryValue mock_parameters;
216 scoped_refptr<NetworkingPrivateProcessClient> process_client(
217 NetworkingPrivateProcessClient::GetProcessClientForProfile(profile()));
218 process_client->UseWiFiServiceMock(mock_parameters);
214 } 219 }
215 #endif // OS_CHROMEOS 220 #endif // OS_CHROMEOS
216 221
217 protected: 222 protected:
218 policy::MockConfigurationPolicyProvider provider_; 223 policy::MockConfigurationPolicyProvider provider_;
219 std::string userhash_; 224 std::string userhash_;
220 }; 225 };
221 226
222 // Place each subtest into a separate browser test so that the stub networking 227 // Place each subtest into a separate browser test so that the stub networking
223 // library state is reset for each subtest run. This way they won't affect each 228 // library state is reset for each subtest run. This way they won't affect each
(...skipping 16 matching lines...) Expand all
240 StartDisconnectNonexistent) { 245 StartDisconnectNonexistent) {
241 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; 246 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_;
242 } 247 }
243 248
244 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, 249 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
245 StartGetPropertiesNonexistent) { 250 StartGetPropertiesNonexistent) {
246 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) 251 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent"))
247 << message_; 252 << message_;
248 } 253 }
249 254
250 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) {
251 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_;
252 }
253
254 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { 255 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) {
255 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; 256 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_;
256 } 257 }
257 258
258 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, 259 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
259 GetVisibleNetworksWifi) { 260 GetVisibleNetworksWifi) {
260 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; 261 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_;
261 } 262 }
262 263
263 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) { 264 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) {
264 EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_; 265 EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_;
265 } 266 }
266 267
267 // Properties are filtered and translated through 268 // Properties are filtered and translated through
268 // ShillToONCTranslator::TranslateWiFiWithState 269 // ShillToONCTranslator::TranslateWiFiWithState
269 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) { 270 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) {
270 EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_; 271 EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_;
271 } 272 }
272 273
273 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) { 274 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) {
274 EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_; 275 EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_;
275 } 276 }
276 277
277 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) { 278 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) {
278 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; 279 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_;
279 } 280 }
280 281
281 #if defined(OS_CHROMEOS) 282 #if defined(OS_CHROMEOS)
283 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) {
284 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_;
285 }
286
282 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) { 287 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) {
283 EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_; 288 EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_;
284 } 289 }
285 290
286 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, 291 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
287 GetManagedProperties) { 292 GetManagedProperties) {
288 ShillServiceClient::TestInterface* service_test = 293 ShillServiceClient::TestInterface* service_test =
289 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); 294 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
290 const std::string uidata_blob = 295 const std::string uidata_blob =
291 "{ \"user_settings\": {" 296 "{ \"user_settings\": {"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, 372 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest,
368 VerifyAndEncryptData) { 373 VerifyAndEncryptData) {
369 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; 374 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_;
370 } 375 }
371 376
372 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, 377 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation,
373 ExtensionNetworkingPrivateApiTest, 378 ExtensionNetworkingPrivateApiTest,
374 testing::Bool()); 379 testing::Bool());
375 380
376 } // namespace chromeos 381 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698