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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/prefs/scoped_user_pref_update.h" | 7 #include "base/prefs/scoped_user_pref_update.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 ~SupervisedUserURLFilterObserver() { | 54 ~SupervisedUserURLFilterObserver() { |
55 url_filter_->RemoveObserver(this); | 55 url_filter_->RemoveObserver(this); |
56 } | 56 } |
57 | 57 |
58 void Wait() { | 58 void Wait() { |
59 message_loop_runner_->Run(); | 59 message_loop_runner_->Run(); |
60 Reset(); | 60 Reset(); |
61 } | 61 } |
62 | 62 |
63 // SupervisedUserURLFilter::Observer | 63 // SupervisedUserURLFilter::Observer |
64 virtual void OnSiteListUpdated() override { | 64 void OnSiteListUpdated() override { message_loop_runner_->Quit(); } |
65 message_loop_runner_->Quit(); | |
66 } | |
67 | 65 |
68 private: | 66 private: |
69 void Reset() { | 67 void Reset() { |
70 message_loop_runner_ = new MessageLoopRunner; | 68 message_loop_runner_ = new MessageLoopRunner; |
71 } | 69 } |
72 | 70 |
73 SupervisedUserURLFilter* url_filter_; | 71 SupervisedUserURLFilter* url_filter_; |
74 scoped_refptr<MessageLoopRunner> message_loop_runner_; | 72 scoped_refptr<MessageLoopRunner> message_loop_runner_; |
75 }; | 73 }; |
76 | 74 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 // ProfileDownloader gets created. | 199 // ProfileDownloader gets created. |
202 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "Logged In"); | 200 profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "Logged In"); |
203 downloader_service->DownloadProfile(base::Bind(&OnProfileDownloadedFail)); | 201 downloader_service->DownloadProfile(base::Bind(&OnProfileDownloadedFail)); |
204 } | 202 } |
205 | 203 |
206 namespace { | 204 namespace { |
207 | 205 |
208 class MockPermissionRequestCreator : public PermissionRequestCreator { | 206 class MockPermissionRequestCreator : public PermissionRequestCreator { |
209 public: | 207 public: |
210 MockPermissionRequestCreator() : enabled_(false) {} | 208 MockPermissionRequestCreator() : enabled_(false) {} |
211 virtual ~MockPermissionRequestCreator() {} | 209 ~MockPermissionRequestCreator() override {} |
212 | 210 |
213 void set_enabled(bool enabled) { | 211 void set_enabled(bool enabled) { |
214 enabled_ = enabled; | 212 enabled_ = enabled; |
215 } | 213 } |
216 | 214 |
217 const std::vector<GURL>& requested_urls() const { | 215 const std::vector<GURL>& requested_urls() const { |
218 return requested_urls_; | 216 return requested_urls_; |
219 } | 217 } |
220 | 218 |
221 void AnswerRequest(size_t index, bool result) { | 219 void AnswerRequest(size_t index, bool result) { |
222 ASSERT_LT(index, requested_urls_.size()); | 220 ASSERT_LT(index, requested_urls_.size()); |
223 callbacks_[index].Run(result); | 221 callbacks_[index].Run(result); |
224 callbacks_.erase(callbacks_.begin() + index); | 222 callbacks_.erase(callbacks_.begin() + index); |
225 requested_urls_.erase(requested_urls_.begin() + index); | 223 requested_urls_.erase(requested_urls_.begin() + index); |
226 } | 224 } |
227 | 225 |
228 private: | 226 private: |
229 // PermissionRequestCreator: | 227 // PermissionRequestCreator: |
230 virtual bool IsEnabled() const override { | 228 bool IsEnabled() const override { return enabled_; } |
231 return enabled_; | |
232 } | |
233 | 229 |
234 virtual void CreatePermissionRequest( | 230 void CreatePermissionRequest(const GURL& url_requested, |
235 const GURL& url_requested, | 231 const SuccessCallback& callback) override { |
236 const SuccessCallback& callback) override { | |
237 ASSERT_TRUE(enabled_); | 232 ASSERT_TRUE(enabled_); |
238 requested_urls_.push_back(url_requested); | 233 requested_urls_.push_back(url_requested); |
239 callbacks_.push_back(callback); | 234 callbacks_.push_back(callback); |
240 } | 235 } |
241 | 236 |
242 bool enabled_; | 237 bool enabled_; |
243 std::vector<GURL> requested_urls_; | 238 std::vector<GURL> requested_urls_; |
244 std::vector<SuccessCallback> callbacks_; | 239 std::vector<SuccessCallback> callbacks_; |
245 | 240 |
246 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator); | 241 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator); |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
574 site_lists[0]->GetSites(&sites); | 569 site_lists[0]->GetSites(&sites); |
575 ASSERT_EQ(1u, sites.size()); | 570 ASSERT_EQ(1u, sites.size()); |
576 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); | 571 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); |
577 | 572 |
578 EXPECT_EQ(SupervisedUserURLFilter::WARN, | 573 EXPECT_EQ(SupervisedUserURLFilter::WARN, |
579 url_filter->GetFilteringBehaviorForURL(example_url)); | 574 url_filter->GetFilteringBehaviorForURL(example_url)); |
580 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 575 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
581 url_filter->GetFilteringBehaviorForURL(moose_url)); | 576 url_filter->GetFilteringBehaviorForURL(moose_url)); |
582 } | 577 } |
583 #endif // defined(ENABLE_EXTENSIONS) | 578 #endif // defined(ENABLE_EXTENSIONS) |
OLD | NEW |