Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(678)

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service_unittest.cc

Issue 615493005: c/b/supervised_user: Use range-based for where appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 supervised_user_service_->GetManualExceptionsForHost("www.example.com", 128 supervised_user_service_->GetManualExceptionsForHost("www.example.com",
129 &exceptions); 129 &exceptions);
130 ASSERT_EQ(2u, exceptions.size()); 130 ASSERT_EQ(2u, exceptions.size());
131 EXPECT_EQ(kExampleBarURL, exceptions[0]); 131 EXPECT_EQ(kExampleBarURL, exceptions[0]);
132 EXPECT_EQ(kExampleFooURL, exceptions[1]); 132 EXPECT_EQ(kExampleFooURL, exceptions[1]);
133 133
134 { 134 {
135 DictionaryPrefUpdate update(profile_->GetPrefs(), 135 DictionaryPrefUpdate update(profile_->GetPrefs(),
136 prefs::kSupervisedUserManualURLs); 136 prefs::kSupervisedUserManualURLs);
137 base::DictionaryValue* dict = update.Get(); 137 base::DictionaryValue* dict = update.Get();
138 for (std::vector<GURL>::iterator it = exceptions.begin(); 138 for (const GURL& url : exceptions)
139 it != exceptions.end(); ++it) { 139 dict->RemoveWithoutPathExpansion(url.spec(), NULL);
140 dict->RemoveWithoutPathExpansion(it->spec(), NULL);
141 }
142 } 140 }
143 141
144 EXPECT_EQ(SupervisedUserService::MANUAL_NONE, 142 EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
145 supervised_user_service_->GetManualBehaviorForURL(kExampleFooURL)); 143 supervised_user_service_->GetManualBehaviorForURL(kExampleFooURL));
146 EXPECT_EQ(SupervisedUserService::MANUAL_NONE, 144 EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
147 supervised_user_service_->GetManualBehaviorForURL(kExampleBarURL)); 145 supervised_user_service_->GetManualBehaviorForURL(kExampleBarURL));
148 EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW, 146 EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
149 supervised_user_service_->GetManualBehaviorForURL( 147 supervised_user_service_->GetManualBehaviorForURL(
150 kExampleFooNoWWWURL)); 148 kExampleFooNoWWWURL));
151 EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW, 149 EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 observer.Wait(); 380 observer.Wait();
383 381
384 site_lists = GetActiveSiteLists(supervised_user_service); 382 site_lists = GetActiveSiteLists(supervised_user_service);
385 ASSERT_EQ(2u, site_lists.size()); 383 ASSERT_EQ(2u, site_lists.size());
386 sites.clear(); 384 sites.clear();
387 site_lists[0]->GetSites(&sites); 385 site_lists[0]->GetSites(&sites);
388 site_lists[1]->GetSites(&sites); 386 site_lists[1]->GetSites(&sites);
389 ASSERT_EQ(4u, sites.size()); 387 ASSERT_EQ(4u, sites.size());
390 // The site lists might be returned in any order, so we put them into a set. 388 // The site lists might be returned in any order, so we put them into a set.
391 std::set<std::string> site_names; 389 std::set<std::string> site_names;
392 for (std::vector<SupervisedUserSiteList::Site>::const_iterator it = 390 for (const SupervisedUserSiteList::Site& site : sites)
393 sites.begin(); it != sites.end(); ++it) { 391 site_names.insert(base::UTF16ToUTF8(site.name));
394 site_names.insert(base::UTF16ToUTF8(it->name)); 392 EXPECT_EQ(1u, site_names.count("YouTube"));
395 } 393 EXPECT_EQ(1u, site_names.count("Homestar Runner"));
396 EXPECT_TRUE(site_names.count("YouTube") == 1u); 394 EXPECT_EQ(1u, site_names.count(std::string()));
397 EXPECT_TRUE(site_names.count("Homestar Runner") == 1u); 395 EXPECT_EQ(1u, site_names.count("Moose"));
398 EXPECT_TRUE(site_names.count(std::string()) == 1u);
399 EXPECT_TRUE(site_names.count("Moose") == 1u);
400 396
401 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 397 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
402 url_filter->GetFilteringBehaviorForURL(example_url)); 398 url_filter->GetFilteringBehaviorForURL(example_url));
403 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 399 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
404 url_filter->GetFilteringBehaviorForURL(moose_url)); 400 url_filter->GetFilteringBehaviorForURL(moose_url));
405 401
406 // Disable the first content pack. 402 // Disable the first content pack.
407 service_->DisableExtension(extension->id(), 403 service_->DisableExtension(extension->id(),
408 extensions::Extension::DISABLE_USER_ACTION); 404 extensions::Extension::DISABLE_USER_ACTION);
409 observer.Wait(); 405 observer.Wait();
410 406
411 site_lists = GetActiveSiteLists(supervised_user_service); 407 site_lists = GetActiveSiteLists(supervised_user_service);
412 ASSERT_EQ(1u, site_lists.size()); 408 ASSERT_EQ(1u, site_lists.size());
413 sites.clear(); 409 sites.clear();
414 site_lists[0]->GetSites(&sites); 410 site_lists[0]->GetSites(&sites);
415 ASSERT_EQ(1u, sites.size()); 411 ASSERT_EQ(1u, sites.size());
416 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); 412 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name);
417 413
418 EXPECT_EQ(SupervisedUserURLFilter::WARN, 414 EXPECT_EQ(SupervisedUserURLFilter::WARN,
419 url_filter->GetFilteringBehaviorForURL(example_url)); 415 url_filter->GetFilteringBehaviorForURL(example_url));
420 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 416 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
421 url_filter->GetFilteringBehaviorForURL(moose_url)); 417 url_filter->GetFilteringBehaviorForURL(moose_url));
422 } 418 }
423 #endif // !defined(OS_ANDROID) 419 #endif // !defined(OS_ANDROID)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698