| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/chromeos/login/user.h" | 10 #include "chrome/browser/chromeos/login/user.h" |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; | 385 EXPECT_TRUE(RunNetworkingSubtest("startDisconnectNonexistent")) << message_; |
| 386 } | 386 } |
| 387 | 387 |
| 388 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 388 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 389 StartGetPropertiesNonexistent) { | 389 StartGetPropertiesNonexistent) { |
| 390 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) | 390 EXPECT_TRUE(RunNetworkingSubtest("startGetPropertiesNonexistent")) |
| 391 << message_; | 391 << message_; |
| 392 } | 392 } |
| 393 | 393 |
| 394 #if defined(OS_CHROMEOS) | 394 #if defined(OS_CHROMEOS) |
| 395 // Non-Chrome OS only supports wifi currently. | 395 // TODO(stevenjb/mef): Fix these on non-Chrome OS, crbug.com/371442. |
| 396 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetNetworks) { |
| 397 // Add a couple of additional networks that are not configured (saved). |
| 398 AddService("stub_wifi3", "wifi3", shill::kTypeWifi, shill::kStateIdle); |
| 399 AddService("stub_wifi4", "wifi4", shill::kTypeWifi, shill::kStateIdle); |
| 400 EXPECT_TRUE(RunNetworkingSubtest("getNetworks")) << message_; |
| 401 } |
| 402 |
| 396 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { | 403 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, GetVisibleNetworks) { |
| 397 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 404 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
| 398 } | 405 } |
| 399 #endif | 406 #endif |
| 400 | 407 |
| 401 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, | 408 IN_PROC_BROWSER_TEST_P(ExtensionNetworkingPrivateApiTest, |
| 402 GetVisibleNetworksWifi) { | 409 GetVisibleNetworksWifi) { |
| 403 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; | 410 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworksWifi")) << message_; |
| 404 } | 411 } |
| 405 | 412 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 base::Unretained(detector()))); | 594 base::Unretained(detector()))); |
| 588 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; | 595 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; |
| 589 } | 596 } |
| 590 #endif // defined(OS_CHROMEOS) | 597 #endif // defined(OS_CHROMEOS) |
| 591 | 598 |
| 592 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, | 599 INSTANTIATE_TEST_CASE_P(ExtensionNetworkingPrivateApiTestInstantiation, |
| 593 ExtensionNetworkingPrivateApiTest, | 600 ExtensionNetworkingPrivateApiTest, |
| 594 testing::Bool()); | 601 testing::Bool()); |
| 595 | 602 |
| 596 } // namespace | 603 } // namespace |
| OLD | NEW |