OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/strings/string_number_conversions.h" | 5 #include "base/strings/string_number_conversions.h" |
6 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 6 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chromeos/dbus/dbus_thread_manager.h" | 9 #include "chromeos/dbus/dbus_thread_manager.h" |
10 #include "chromeos/dbus/fake_shill_profile_client.h" | 10 #include "chromeos/dbus/fake_shill_profile_client.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "testing/gmock/include/gmock/gmock.h" | 24 #include "testing/gmock/include/gmock/gmock.h" |
25 #include "third_party/cros_system_api/dbus/service_constants.h" | 25 #include "third_party/cros_system_api/dbus/service_constants.h" |
26 | 26 |
27 using testing::_; | 27 using testing::_; |
28 using testing::Invoke; | 28 using testing::Invoke; |
29 | 29 |
30 namespace chromeos { | 30 namespace chromeos { |
31 | 31 |
32 namespace { | 32 namespace { |
33 | 33 |
34 namespace api_vpn = extensions::core_api::vpn_provider; | 34 namespace api_vpn = extensions::api::vpn_provider; |
35 | 35 |
36 const char kNetworkProfilePath[] = "/network/test"; | 36 const char kNetworkProfilePath[] = "/network/test"; |
37 const char kTestConfig[] = "testconfig"; | 37 const char kTestConfig[] = "testconfig"; |
38 const char* kParameterValues[] = {"10.10.10.10", | 38 const char* kParameterValues[] = {"10.10.10.10", |
39 "24", | 39 "24", |
40 "63.145.213.129/32 63.145.212.0/24", | 40 "63.145.213.129/32 63.145.212.0/24", |
41 "0.0.0.0/0 63.145.212.128/25", | 41 "0.0.0.0/0 63.145.212.128/25", |
42 "8.8.8.8", | 42 "8.8.8.8", |
43 "1600", | 43 "1600", |
44 "10.10.10.255", | 44 "10.10.10.255", |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 extension_service->BlacklistExtensionForTest(extension_id_); | 463 extension_service->BlacklistExtensionForTest(extension_id_); |
464 content::RunAllPendingInMessageLoop(); | 464 content::RunAllPendingInMessageLoop(); |
465 EXPECT_FALSE(DoesConfigExist(kTestConfig)); | 465 EXPECT_FALSE(DoesConfigExist(kTestConfig)); |
466 EXPECT_FALSE(DBusThreadManager::Get() | 466 EXPECT_FALSE(DBusThreadManager::Get() |
467 ->GetShillProfileClient() | 467 ->GetShillProfileClient() |
468 ->GetTestInterface() | 468 ->GetTestInterface() |
469 ->GetService(service_path, &profile_path, &properties)); | 469 ->GetService(service_path, &profile_path, &properties)); |
470 } | 470 } |
471 | 471 |
472 } // namespace chromeos | 472 } // namespace chromeos |
OLD | NEW |