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/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 // Synchronous methods | 139 // Synchronous methods |
140 scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override { | 140 scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override { |
141 scoped_ptr<base::ListValue> result; | 141 scoped_ptr<base::ListValue> result; |
142 if (!fail_) { | 142 if (!fail_) { |
143 result.reset(new base::ListValue); | 143 result.reset(new base::ListValue); |
144 result->AppendString(::onc::network_config::kEthernet); | 144 result->AppendString(::onc::network_config::kEthernet); |
145 } | 145 } |
146 return result.Pass(); | 146 return result.Pass(); |
147 } | 147 } |
148 | 148 |
149 scoped_ptr<DeviceStateMap> GetDeviceStates() override { | |
150 scoped_ptr<DeviceStateMap> result; | |
151 if (!fail_) { | |
152 result.reset(new DeviceStateMap); | |
153 (*result)[ ::onc::network_config::kEthernet] = | |
pneubeck (no reviews)
2015/04/08 10:05:07
nit: remove space after [
stevenjb
2015/04/08 20:27:30
Blame clang :P
| |
154 ::onc::device_state::kEnabled; | |
155 } | |
156 return result.Pass(); | |
157 } | |
158 | |
149 bool EnableNetworkType(const std::string& type) override { | 159 bool EnableNetworkType(const std::string& type) override { |
150 enabled_[type] = true; | 160 enabled_[type] = true; |
151 return !fail_; | 161 return !fail_; |
152 } | 162 } |
153 | 163 |
154 bool DisableNetworkType(const std::string& type) override { | 164 bool DisableNetworkType(const std::string& type) override { |
155 disabled_[type] = true; | 165 disabled_[type] = true; |
156 return !fail_; | 166 return !fail_; |
157 } | 167 } |
158 | 168 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
355 } | 365 } |
356 | 366 |
357 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) { | 367 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) { |
358 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 368 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
359 } | 369 } |
360 | 370 |
361 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) { | 371 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) { |
362 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; | 372 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; |
363 } | 373 } |
364 | 374 |
375 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetDeviceStates) { | |
376 EXPECT_TRUE(RunNetworkingSubtest("getDeviceStates")) << message_; | |
377 } | |
378 | |
365 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, EnableNetworkType) { | 379 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, EnableNetworkType) { |
366 EXPECT_TRUE(RunNetworkingSubtest("enableNetworkType")) << message_; | 380 EXPECT_TRUE(RunNetworkingSubtest("enableNetworkType")) << message_; |
367 EXPECT_TRUE(GetEnabled(::onc::network_config::kEthernet)); | 381 EXPECT_TRUE(GetEnabled(::onc::network_config::kEthernet)); |
368 } | 382 } |
369 | 383 |
370 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, DisableNetworkType) { | 384 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, DisableNetworkType) { |
371 EXPECT_TRUE(RunNetworkingSubtest("disableNetworkType")) << message_; | 385 EXPECT_TRUE(RunNetworkingSubtest("disableNetworkType")) << message_; |
372 EXPECT_TRUE(GetDisabled(::onc::network_config::kEthernet)); | 386 EXPECT_TRUE(GetDisabled(::onc::network_config::kEthernet)); |
373 } | 387 } |
374 | 388 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
452 } | 466 } |
453 | 467 |
454 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) { | 468 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) { |
455 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 469 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
456 } | 470 } |
457 | 471 |
458 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) { | 472 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) { |
459 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; | 473 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; |
460 } | 474 } |
461 | 475 |
476 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetDeviceStates) { | |
477 EXPECT_FALSE(RunNetworkingSubtest("getDeviceStates")) << message_; | |
478 } | |
479 | |
462 // Note: Synchronous methods never fail: | 480 // Note: Synchronous methods never fail: |
463 // * disableNetworkType | 481 // * disableNetworkType |
464 // * enableNetworkType | 482 // * enableNetworkType |
465 // * requestNetworkScan | 483 // * requestNetworkScan |
466 | 484 |
467 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartConnect) { | 485 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartConnect) { |
468 EXPECT_FALSE(RunNetworkingSubtest("startConnect")) << message_; | 486 EXPECT_FALSE(RunNetworkingSubtest("startConnect")) << message_; |
469 } | 487 } |
470 | 488 |
471 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartDisconnect) { | 489 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, StartDisconnect) { |
(...skipping 25 matching lines...) Expand all Loading... | |
497 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; | 515 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; |
498 } | 516 } |
499 | 517 |
500 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { | 518 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { |
501 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; | 519 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; |
502 } | 520 } |
503 | 521 |
504 #endif // defined(OS_WIN) | 522 #endif // defined(OS_WIN) |
505 | 523 |
506 } // namespace extensions | 524 } // namespace extensions |
OLD | NEW |