c/b/supervised_user: Use range-based for where appropriate.

chrome/browser/supervised_user/supervised_user_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
@@ skipping 82 matching lines @@
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SupervisedUserURLFilter::SetDefaultFilteringBehavior,
                  io_url_filter_.get(), behavior));
 }
 
 void SupervisedUserService::URLFilterContext::LoadWhitelists(
     ScopedVector<SupervisedUserSiteList> site_lists) {
   // SupervisedUserURLFilter::LoadWhitelists takes ownership of |site_lists|,
   // so we make an additional copy of it.
   /// TODO(bauerb): This is kinda ugly.

[Bernhard Bauer, 2014/09/30 10:02:07]

While you're here, could you remove the extra slash here?

[Marc Treib, 2014/09/30 10:21:49]

Done.

   ScopedVector<SupervisedUserSiteList> site_lists_copy;
-  for (ScopedVector<SupervisedUserSiteList>::iterator it = site_lists.begin();
-       it != site_lists.end(); ++it) {
-    site_lists_copy.push_back((*it)->Clone());
-  }
+  for (const SupervisedUserSiteList* site_list : site_lists)
+    site_lists_copy.push_back(site_list->Clone());
+
   ui_url_filter_->LoadWhitelists(site_lists.Pass());
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SupervisedUserURLFilter::LoadWhitelists,
                  io_url_filter_, base::Passed(&site_lists_copy)));
 }
 
 void SupervisedUserService::URLFilterContext::LoadBlacklist(
     const base::FilePath& path) {
@@ skipping 187 matching lines @@
 #endif
 }
 
 void SupervisedUserService::AddNavigationBlockedCallback(
     const NavigationBlockedCallback& callback) {
   navigation_blocked_callbacks_.push_back(callback);
 }
 
 void SupervisedUserService::DidBlockNavigation(
     content::WebContents* web_contents) {
-  for (std::vector<NavigationBlockedCallback>::iterator it =
-           navigation_blocked_callbacks_.begin();
-       it != navigation_blocked_callbacks_.end(); ++it) {
-    it->Run(web_contents);
-  }
+  for (const auto& callback : navigation_blocked_callbacks_)
+    callback.Run(web_contents);
 }
 
 void SupervisedUserService::AddObserver(
     SupervisedUserServiceObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void SupervisedUserService::RemoveObserver(
     SupervisedUserServiceObserver* observer) {
   observer_list_.RemoveObserver(observer);
@@ skipping 157 matching lines @@
 
 ScopedVector<SupervisedUserSiteList>
 SupervisedUserService::GetActiveSiteLists() {
   ScopedVector<SupervisedUserSiteList> site_lists;
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   // Can be NULL in unit tests.
   if (!extension_service)
     return site_lists.Pass();
 
-  const extensions::ExtensionSet* extensions = extension_service->extensions();
-  for (extensions::ExtensionSet::const_iterator it = extensions->begin();
-       it != extensions->end(); ++it) {
-    const extensions::Extension* extension = it->get();
+  for (const scoped_refptr<const extensions::Extension>& extension :

[Bernhard Bauer, 2014/09/30 10:02:08]

Hm... I guess unwrapping the scoped_refptr here wouldn't work, right?

[Marc Treib, 2014/09/30 10:21:49]

I don't think that's possible (is it?)
As it is, this is quite ugly, but at least now the type is visible, so I think
it's a huge improvement over the old version.

+           *extension_service->extensions()) {
     if (!extension_service->IsExtensionEnabled(extension->id()))
       continue;
 
     extensions::ExtensionResource site_list =
-        extensions::SupervisedUserInfo::GetContentPackSiteList(extension);
+        extensions::SupervisedUserInfo::GetContentPackSiteList(extension.get());
     if (!site_list.empty()) {
       site_lists.push_back(new SupervisedUserSiteList(extension->id(),
                                                       site_list.GetFilePath()));
     }
   }
 
   return site_lists.Pass();
 }
 
 void SupervisedUserService::SetExtensionsActive() {
@@ skipping 413 matching lines @@
   // The active user can be NULL in unit tests.
   if (user_manager::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
         user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }