| OLD | NEW |
| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 206 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 206 ExtensionApiTest::SetUpCommandLine(command_line); | 207 ExtensionApiTest::SetUpCommandLine(command_line); |
| 207 // Whitelist the extension ID of the test extension. | 208 // Whitelist the extension ID of the test extension. |
| 208 command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID, | 209 command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID, |
| 209 "epcifkihnkjgphfkloaaleeakhpmgdmn"); | 210 "epcifkihnkjgphfkloaaleeakhpmgdmn"); |
| 210 } | 211 } |
| 211 | 212 |
| 212 virtual void SetUpOnMainThread() OVERRIDE { | 213 virtual void SetUpOnMainThread() OVERRIDE { |
| 213 ExtensionApiTest::SetUpOnMainThread(); | 214 ExtensionApiTest::SetUpOnMainThread(); |
| 214 content::RunAllPendingInMessageLoop(); | 215 content::RunAllPendingInMessageLoop(); |
| 216 base::DictionaryValue mock_parameters; |
| 217 scoped_refptr<NetworkingPrivateProcessClient> process_client( |
| 218 NetworkingPrivateProcessClient::GetProcessClientForProfile(profile())); |
| 219 process_client->UseWiFiServiceMock(mock_parameters); |
| 215 } | 220 } |
| 216 #endif // OS_CHROMEOS | 221 #endif // OS_CHROMEOS |
| 217 | 222 |
| 218 protected: | 223 protected: |
| 219 policy::MockConfigurationPolicyProvider provider_; | 224 policy::MockConfigurationPolicyProvider provider_; |
| 220 std::string userhash_; | 225 std::string userhash_; |
| 221 }; | 226 }; |
| 222 | 227 |
| 223 // Place each subtest into a separate browser test so that the stub networking | 228 // Place each subtest into a separate browser test so that the stub networking |
| 224 // library state is reset for each subtest run. This way they won't affect each | 229 // library state is reset for each subtest run. This way they won't affect each |
| (...skipping 16 matching lines...) Expand all Loading... |
| 241 StartDisconnectNonexistent) { | 246 StartDisconnectNonexistent) { |
| 242 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; | 247 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; |
| 243 } | 248 } |
| 244 | 249 |
| 245 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 250 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 246 StartGetPropertiesNonexistent) { | 251 StartGetPropertiesNonexistent) { |
| 247 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) | 252 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) |
| 248 << message_; | 253 << message_; |
| 249 } | 254 } |
| 250 | 255 |
| 251 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) { | |
| 252 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; | |
| 253 } | |
| 254 | |
| 255 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { | 256 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { |
| 256 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 257 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
| 257 } | 258 } |
| 258 | 259 |
| 259 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 260 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 260 GetVisibleNetworksWifi) { | 261 GetVisibleNetworksWifi) { |
| 261 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; | 262 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; |
| 262 } | 263 } |
| 263 | 264 |
| 264 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) { | 265 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, RequestNetworkScan) { |
| 265 EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_; | 266 EXPECT_TRUE(RunNetworkingSubtest("requestNetworkScan")) << message_; |
| 266 } | 267 } |
| 267 | 268 |
| 268 // Properties are filtered and translated through | 269 // Properties are filtered and translated through |
| 269 // ShillToONCTranslator::TranslateWiFiWithState | 270 // ShillToONCTranslator::TranslateWiFiWithState |
| 270 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) { | 271 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetProperties) { |
| 271 EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_; | 272 EXPECT_TRUE(RunNetworkingSubtest("getProperties")) << message_; |
| 272 } | 273 } |
| 273 | 274 |
| 274 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) { | 275 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetState) { |
| 275 EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_; | 276 EXPECT_TRUE(RunNetworkingSubtest("getState")) << message_; |
| 276 } | 277 } |
| 277 | 278 |
| 278 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) { | 279 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, SetProperties) { |
| 279 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; | 280 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; |
| 280 } | 281 } |
| 281 | 282 |
| 282 #if defined(OS_CHROMEOS) | 283 #if defined(OS_CHROMEOS) |
| 284 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, CreateNetwork) { |
| 285 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; |
| 286 } |
| 287 |
| 283 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) { | 288 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetStateNonExistent) { |
| 284 EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_; | 289 EXPECT_TRUE(RunNetworkingSubtest("getStateNonExistent")) << message_; |
| 285 } | 290 } |
| 286 | 291 |
| 287 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 292 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 288 GetManagedProperties) { | 293 GetManagedProperties) { |
| 289 ShillServiceClient::TestInterface* service_test = | 294 ShillServiceClient::TestInterface* service_test = |
| 290 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); | 295 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); |
| 291 const std::string uidata_blob = | 296 const std::string uidata_blob = |
| 292 "{ \"user_settings\": {" | 297 "{ \"user_settings\": {" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 373 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 369 VerifyAndEncryptData) { | 374 VerifyAndEncryptData) { |
| 370 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; | 375 EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; |
| 371 } | 376 } |
| 372 | 377 |
| 373 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, | 378 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, |
| 374 ExtensionNetworkingPrivateApiTest, | 379 ExtensionNetworkingPrivateApiTest, |
| 375 testing::Bool()); | 380 testing::Bool()); |
| 376 | 381 |
| 377 } // namespace chromeos | 382 } // namespace chromeos |
| OLD | NEW |