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 <set> | 6 #include <set> |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
14 #include "base/prefs/scoped_user_pref_update.h" | 14 #include "base/prefs/scoped_user_pref_update.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 18 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
19 #include "chrome/browser/supervised_user/supervised_user_site_list.h" | 19 #include "chrome/browser/supervised_user/supervised_user_site_list.h" |
20 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 20 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
21 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
| 24 #include "content/public/test/test_browser_thread_bundle.h" |
24 #include "sync/api/sync_change.h" | 25 #include "sync/api/sync_change.h" |
25 #include "sync/api/sync_error_factory.h" | 26 #include "sync/api/sync_error_factory.h" |
26 #include "sync/protocol/sync.pb.h" | 27 #include "sync/protocol/sync.pb.h" |
27 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
28 | 29 |
29 namespace { | 30 namespace { |
30 | 31 |
31 const char kClientId[] = "client-id"; | 32 const char kClientId[] = "client-id"; |
32 | 33 |
33 class MockSupervisedUserWhitelistInstaller | 34 class MockSupervisedUserWhitelistInstaller |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 return nullptr; | 146 return nullptr; |
146 } | 147 } |
147 | 148 |
148 void OnSiteListsChanged( | 149 void OnSiteListsChanged( |
149 const std::vector<scoped_refptr<SupervisedUserSiteList>>& site_lists) { | 150 const std::vector<scoped_refptr<SupervisedUserSiteList>>& site_lists) { |
150 site_lists_ = site_lists; | 151 site_lists_ = site_lists; |
151 if (!site_lists_changed_callback_.is_null()) | 152 if (!site_lists_changed_callback_.is_null()) |
152 site_lists_changed_callback_.Run(); | 153 site_lists_changed_callback_.Run(); |
153 } | 154 } |
154 | 155 |
155 base::MessageLoop message_loop_; | 156 content::TestBrowserThreadBundle thread_bundle_; |
156 TestingProfile profile_; | 157 TestingProfile profile_; |
157 | 158 |
158 scoped_ptr<MockSupervisedUserWhitelistInstaller> installer_; | 159 scoped_ptr<MockSupervisedUserWhitelistInstaller> installer_; |
159 scoped_ptr<SupervisedUserWhitelistService> service_; | 160 scoped_ptr<SupervisedUserWhitelistService> service_; |
160 | 161 |
161 std::vector<scoped_refptr<SupervisedUserSiteList>> site_lists_; | 162 std::vector<scoped_refptr<SupervisedUserSiteList>> site_lists_; |
162 base::Closure site_lists_changed_callback_; | 163 base::Closure site_lists_changed_callback_; |
163 }; | 164 }; |
164 | 165 |
165 TEST_F(SupervisedUserWhitelistServiceTest, MergeEmpty) { | 166 TEST_F(SupervisedUserWhitelistServiceTest, MergeEmpty) { |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS); | 269 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS); |
269 ASSERT_EQ(2u, sync_data.size()); | 270 ASSERT_EQ(2u, sync_data.size()); |
270 const sync_pb::ManagedUserWhitelistSpecifics* whitelist = | 271 const sync_pb::ManagedUserWhitelistSpecifics* whitelist = |
271 FindWhitelist(sync_data, "aaaa"); | 272 FindWhitelist(sync_data, "aaaa"); |
272 ASSERT_TRUE(whitelist); | 273 ASSERT_TRUE(whitelist); |
273 EXPECT_EQ("Whitelist A", whitelist->name()); | 274 EXPECT_EQ("Whitelist A", whitelist->name()); |
274 whitelist = FindWhitelist(sync_data, "bbbb"); | 275 whitelist = FindWhitelist(sync_data, "bbbb"); |
275 ASSERT_TRUE(whitelist); | 276 ASSERT_TRUE(whitelist); |
276 EXPECT_EQ("Whitelist B", whitelist->name()); | 277 EXPECT_EQ("Whitelist B", whitelist->name()); |
277 } | 278 } |
OLD | NEW |