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 "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 5 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <memory> | 8 #include <memory> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
19 #include "build/build_config.h" | 19 #include "build/build_config.h" |
20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
21 #include "chrome/browser/supervised_user/supervised_user_site_list.h" | 21 #include "chrome/browser/supervised_user/supervised_user_site_list.h" |
22 #include "chrome/common/chrome_paths.h" | 22 #include "chrome/common/chrome_paths.h" |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
24 #include "chrome/test/base/testing_profile.h" | 24 #include "chrome/test/base/testing_profile.h" |
25 #include "components/prefs/scoped_user_pref_update.h" | 25 #include "components/prefs/scoped_user_pref_update.h" |
| 26 #include "components/sync/api/sync_change.h" |
| 27 #include "components/sync/api/sync_error_factory.h" |
| 28 #include "components/sync/protocol/sync.pb.h" |
26 #include "content/public/test/test_browser_thread_bundle.h" | 29 #include "content/public/test/test_browser_thread_bundle.h" |
27 #include "sync/api/sync_change.h" | |
28 #include "sync/api/sync_error_factory.h" | |
29 #include "sync/protocol/sync.pb.h" | |
30 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
31 | 31 |
32 #if !defined(OS_ANDROID) | 32 #if !defined(OS_ANDROID) |
33 #include "components/safe_json/testing_json_parser.h" | 33 #include "components/safe_json/testing_json_parser.h" |
34 #endif | 34 #endif |
35 | 35 |
36 namespace { | 36 namespace { |
37 | 37 |
38 const char kClientId[] = "client-id"; | 38 const char kClientId[] = "client-id"; |
39 | 39 |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS); | 277 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS); |
278 ASSERT_EQ(2u, sync_data.size()); | 278 ASSERT_EQ(2u, sync_data.size()); |
279 const sync_pb::ManagedUserWhitelistSpecifics* whitelist = | 279 const sync_pb::ManagedUserWhitelistSpecifics* whitelist = |
280 FindWhitelist(sync_data, "aaaa"); | 280 FindWhitelist(sync_data, "aaaa"); |
281 ASSERT_TRUE(whitelist); | 281 ASSERT_TRUE(whitelist); |
282 EXPECT_EQ("Whitelist A", whitelist->name()); | 282 EXPECT_EQ("Whitelist A", whitelist->name()); |
283 whitelist = FindWhitelist(sync_data, "bbbb"); | 283 whitelist = FindWhitelist(sync_data, "bbbb"); |
284 ASSERT_TRUE(whitelist); | 284 ASSERT_TRUE(whitelist); |
285 EXPECT_EQ("Whitelist B", whitelist->name()); | 285 EXPECT_EQ("Whitelist B", whitelist->name()); |
286 } | 286 } |
OLD | NEW |