| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/common/system/chromeos/network/vpn_list.h" | 5 #include "ash/system/network/vpn_list.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/public/interfaces/vpn_list.mojom.h" | 10 #include "ash/public/interfaces/vpn_list.mojom.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 13 |
| 14 using ash::mojom::ThirdPartyVpnProvider; | 14 using ash::mojom::ThirdPartyVpnProvider; |
| 15 using ash::mojom::ThirdPartyVpnProviderPtr; | 15 using ash::mojom::ThirdPartyVpnProviderPtr; |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 third_party_providers.push_back(std::move(third_party1)); | 90 third_party_providers.push_back(std::move(third_party1)); |
| 91 vpn_list.SetThirdPartyVpnProviders(std::move(third_party_providers)); | 91 vpn_list.SetThirdPartyVpnProviders(std::move(third_party_providers)); |
| 92 | 92 |
| 93 // Observer was notified. | 93 // Observer was notified. |
| 94 EXPECT_EQ(1, observer.change_count_); | 94 EXPECT_EQ(1, observer.change_count_); |
| 95 | 95 |
| 96 vpn_list.RemoveObserver(&observer); | 96 vpn_list.RemoveObserver(&observer); |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace ash | 99 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
