Supervised users: When an extension requires new permissions, send request to custodian

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 513 matching lines @@
 
 size_t SupervisedUserService::FindEnabledPermissionRequestCreator(
     size_t start) {
   for (size_t i = start; i < permissions_creators_.size(); ++i) {
     if (permissions_creators_[i]->IsEnabled())
       return i;
   }
   return permissions_creators_.size();
 }
 
-void SupervisedUserService::AddAccessRequestInternal(
+void SupervisedUserService::AddURLAccessRequestInternal(
     const GURL& url,
     const SuccessCallback& callback,
     size_t index) {
   // Find a permission request creator that is enabled.
   size_t next_index = FindEnabledPermissionRequestCreator(index);
   if (next_index >= permissions_creators_.size()) {
     callback.Run(false);
     return;
   }
 
-  permissions_creators_[next_index]->CreatePermissionRequest(
+  permissions_creators_[next_index]->CreateURLAccessRequest(
       url,
-      base::Bind(&SupervisedUserService::OnPermissionRequestIssued,
+      base::Bind(&SupervisedUserService::OnURLAccessRequestIssued,
                  weak_ptr_factory_.GetWeakPtr(), url, callback, next_index));
 }
 
-void SupervisedUserService::OnPermissionRequestIssued(
+void SupervisedUserService::OnURLAccessRequestIssued(
     const GURL& url,
     const SuccessCallback& callback,
     size_t index,
     bool success) {
   if (success) {
     callback.Run(true);
     return;
   }
 
-  AddAccessRequestInternal(url, callback, index + 1);
+  AddURLAccessRequestInternal(url, callback, index + 1);
+}
+
+void SupervisedUserService::AddExtensionUpdateRequestInternal(
+    const std::string& extension_id,
+    const SuccessCallback& callback,
+    size_t index) {
+  // Find a permission request creator that is enabled.

[Bernhard Bauer, 2015/03/02 16:41:56]

Urr... it's not particularly nice to duplicate this code.

An alternative would be to have a single SendRequest method that can take
different kinds of requests. A request could either have polymorphism via
subclasses (more OO-like), or be a flat struct (less overhead).

[Marc Treib, 2015/03/02 18:26:00]

Done.

+  size_t next_index = FindEnabledPermissionRequestCreator(index);
+  if (next_index >= permissions_creators_.size()) {
+    callback.Run(false);
+    return;
+  }
+
+  permissions_creators_[next_index]->CreateExtensionUpdateRequest(
+      extension_id,
+      base::Bind(&SupervisedUserService::OnExtensionUpdateRequestIssued,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 extension_id, callback, next_index));
+}
+
+void SupervisedUserService::OnExtensionUpdateRequestIssued(
+    const std::string& extension_id,
+    const SuccessCallback& callback,
+    size_t index,
+    bool success) {
+  if (success) {
+    callback.Run(true);
+    return;
+  }
+
+  AddExtensionUpdateRequestInternal(extension_id, callback, index + 1);
 }
 
 void SupervisedUserService::OnSupervisedUserIdChanged() {
   SetActive(ProfileIsSupervised());
 }
 
 void SupervisedUserService::OnDefaultFilteringBehaviorChanged() {
   DCHECK(ProfileIsSupervised());
 
   int behavior_value = profile_->GetPrefs()->GetInteger(
@@ skipping 52 matching lines @@
 
 void SupervisedUserService::OnBlacklistLoaded() {
   FOR_EACH_OBSERVER(
       SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
 }
 
 bool SupervisedUserService::AccessRequestsEnabled() {
   return FindEnabledPermissionRequestCreator(0) < permissions_creators_.size();
 }
 
-void SupervisedUserService::AddAccessRequest(const GURL& url,
-                                             const SuccessCallback& callback) {
-  AddAccessRequestInternal(SupervisedUserURLFilter::Normalize(url), callback,
-                           0);
+void SupervisedUserService::AddURLAccessRequest(
+    const GURL& url,
+    const SuccessCallback& callback) {
+  AddURLAccessRequestInternal(
+      SupervisedUserURLFilter::Normalize(url), callback, 0);
+}
+
+void SupervisedUserService::AddExtensionUpdateRequest(
+    const std::string& extension_id,
+    const SuccessCallback& callback) {
+  AddExtensionUpdateRequestInternal(extension_id, callback, 0);
 }
 
 void SupervisedUserService::InitSync(const std::string& refresh_token) {
   StartSetupSync();
 
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   token_service->UpdateCredentials(supervised_users::kSupervisedUserPseudoEmail,
                                    refresh_token);
 
@@ skipping 265 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
 }