Chromium Code Reviews| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 VoidResult(success_callback, failure_callback); | 64 VoidResult(success_callback, failure_callback); |
| 65 } | 65 } |
| 66 | 66 |
| 67 void CreateNetwork(bool shared, | 67 void CreateNetwork(bool shared, |
| 68 scoped_ptr<base::DictionaryValue> properties, | 68 scoped_ptr<base::DictionaryValue> properties, |
| 69 const StringCallback& success_callback, | 69 const StringCallback& success_callback, |
| 70 const FailureCallback& failure_callback) override { | 70 const FailureCallback& failure_callback) override { |
| 71 StringResult(success_callback, failure_callback); | 71 StringResult(success_callback, failure_callback); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void ForgetNetwork(const std::string& guid, | |
| 75 const VoidCallback& success_callback, | |
| 76 const FailureCallback& failure_callback) override { | |
| 77 VoidResult(success_callback, failure_callback); | |
| 78 } | |
| 79 | |
| 74 void GetNetworks(const std::string& network_type, | 80 void GetNetworks(const std::string& network_type, |
| 75 bool configured_only, | 81 bool configured_only, |
| 76 bool visible_only, | 82 bool visible_only, |
| 77 int limit, | 83 int limit, |
| 78 const NetworkListCallback& success_callback, | 84 const NetworkListCallback& success_callback, |
| 79 const FailureCallback& failure_callback) override { | 85 const FailureCallback& failure_callback) override { |
| 80 if (fail_) { | 86 if (fail_) { |
| 81 failure_callback.Run(kFailure); | 87 failure_callback.Run(kFailure); |
| 82 } else { | 88 } else { |
| 83 scoped_ptr<base::ListValue> result(new base::ListValue); | 89 scoped_ptr<base::ListValue> result(new base::ListValue); |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 324 } | 330 } |
| 325 | 331 |
| 326 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, SetProperties) { | 332 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, SetProperties) { |
| 327 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; | 333 EXPECT_TRUE(RunNetworkingSubtest("setProperties")) << message_; |
| 328 } | 334 } |
| 329 | 335 |
| 330 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, CreateNetwork) { | 336 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, CreateNetwork) { |
| 331 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; | 337 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; |
| 332 } | 338 } |
| 333 | 339 |
| 340 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, ForgetNetwork) { | |
| 341 EXPECT_TRUE(RunNetworkingSubtest("createNetwork")) << message_; | |
|
pneubeck (no reviews)
2015/03/16 10:14:57
wrong test, should call 'forgetNetwork'
stevenjb
2015/03/20 16:52:27
Oops. Done.
| |
| 342 } | |
| 343 | |
| 334 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetNetworks) { | 344 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetNetworks) { |
| 335 EXPECT_TRUE(RunNetworkingSubtest("getNetworks")) << message_; | 345 EXPECT_TRUE(RunNetworkingSubtest("getNetworks")) << message_; |
| 336 } | 346 } |
| 337 | 347 |
| 338 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) { | 348 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetVisibleNetworks) { |
| 339 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 349 EXPECT_TRUE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
| 340 } | 350 } |
| 341 | 351 |
| 342 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) { | 352 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTest, GetEnabledNetworkTypes) { |
| 343 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; | 353 EXPECT_TRUE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 } | 423 } |
| 414 | 424 |
| 415 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, SetProperties) { | 425 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, SetProperties) { |
| 416 EXPECT_FALSE(RunNetworkingSubtest("setProperties")) << message_; | 426 EXPECT_FALSE(RunNetworkingSubtest("setProperties")) << message_; |
| 417 } | 427 } |
| 418 | 428 |
| 419 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, CreateNetwork) { | 429 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, CreateNetwork) { |
| 420 EXPECT_FALSE(RunNetworkingSubtest("createNetwork")) << message_; | 430 EXPECT_FALSE(RunNetworkingSubtest("createNetwork")) << message_; |
| 421 } | 431 } |
| 422 | 432 |
| 433 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, ForgetNetwork) { | |
| 434 EXPECT_FALSE(RunNetworkingSubtest("createNetwork")) << message_; | |
|
pneubeck (no reviews)
2015/03/16 10:14:57
wrong test, should call 'forgetNetwork'
stevenjb
2015/03/20 16:52:27
Done.
| |
| 435 } | |
| 436 | |
| 423 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetNetworks) { | 437 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetNetworks) { |
| 424 EXPECT_FALSE(RunNetworkingSubtest("getNetworks")) << message_; | 438 EXPECT_FALSE(RunNetworkingSubtest("getNetworks")) << message_; |
| 425 } | 439 } |
| 426 | 440 |
| 427 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) { | 441 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetVisibleNetworks) { |
| 428 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_; | 442 EXPECT_FALSE(RunNetworkingSubtest("getVisibleNetworks")) << message_; |
| 429 } | 443 } |
| 430 | 444 |
| 431 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) { | 445 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetEnabledNetworkTypes) { |
| 432 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; | 446 EXPECT_FALSE(RunNetworkingSubtest("getEnabledNetworkTypes")) << message_; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 466 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; | 480 EXPECT_FALSE(RunNetworkingSubtest("getWifiTDLSStatus")) << message_; |
| 467 } | 481 } |
| 468 | 482 |
| 469 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { | 483 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, GetCaptivePortalStatus) { |
| 470 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; | 484 EXPECT_FALSE(RunNetworkingSubtest("getCaptivePortalStatus")) << message_; |
| 471 } | 485 } |
| 472 | 486 |
| 473 #endif // defined(OS_WIN) | 487 #endif // defined(OS_WIN) |
| 474 | 488 |
| 475 } // namespace extensions | 489 } // namespace extensions |
| OLD | NEW |