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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 10 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 shill::kDnsServersParameterThirdPartyVpn, | 54 shill::kDnsServersParameterThirdPartyVpn, |
55 shill::kMtuParameterThirdPartyVpn, | 55 shill::kMtuParameterThirdPartyVpn, |
56 shill::kBroadcastAddressParameterThirdPartyVpn, | 56 shill::kBroadcastAddressParameterThirdPartyVpn, |
57 shill::kDomainSearchParameterThirdPartyVpn}; | 57 shill::kDomainSearchParameterThirdPartyVpn}; |
58 | 58 |
59 void DoNothingFailureCallback(const std::string& error_name, | 59 void DoNothingFailureCallback(const std::string& error_name, |
60 scoped_ptr<base::DictionaryValue> error_data) { | 60 scoped_ptr<base::DictionaryValue> error_data) { |
61 EXPECT_EQ(true, false); | 61 EXPECT_EQ(true, false); |
62 } | 62 } |
63 | 63 |
64 void DoNothingSuccessCallback(const std::string& service_path) { | 64 void DoNothingSuccessCallback(const std::string& service_path, |
65 } | 65 const std::string& guid) {} |
66 | 66 |
67 } // namespace | 67 } // namespace |
68 | 68 |
69 // Records the number of calls and their parameters. Always replies successfully | 69 // Records the number of calls and their parameters. Always replies successfully |
70 // to calls. | 70 // to calls. |
71 class TestShillThirdPartyVpnDriverClient | 71 class TestShillThirdPartyVpnDriverClient |
72 : public FakeShillThirdPartyVpnDriverClient { | 72 : public FakeShillThirdPartyVpnDriverClient { |
73 public: | 73 public: |
74 void SetParameters( | 74 void SetParameters( |
75 const std::string& object_path_value, | 75 const std::string& object_path_value, |
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 extension_service->BlacklistExtensionForTest(extension_id_); | 477 extension_service->BlacklistExtensionForTest(extension_id_); |
478 content::RunAllPendingInMessageLoop(); | 478 content::RunAllPendingInMessageLoop(); |
479 EXPECT_FALSE(DoesConfigExist(kTestConfig)); | 479 EXPECT_FALSE(DoesConfigExist(kTestConfig)); |
480 EXPECT_FALSE(DBusThreadManager::Get() | 480 EXPECT_FALSE(DBusThreadManager::Get() |
481 ->GetShillProfileClient() | 481 ->GetShillProfileClient() |
482 ->GetTestInterface() | 482 ->GetTestInterface() |
483 ->GetService(service_path, &profile_path, &properties)); | 483 ->GetService(service_path, &profile_path, &properties)); |
484 } | 484 } |
485 | 485 |
486 } // namespace chromeos | 486 } // namespace chromeos |
OLD | NEW |