Supervised users: Include extension version in update requests

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"
 #include "base/strings/utf_string_conversions.h"
+#include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/experimental/supervised_user_blacklist_downloader.h"
 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_service.h"
 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_service_factory.h"
@@ skipping 57 matching lines @@
 };
 
 void CreateURLAccessRequest(
     const GURL& url,
     PermissionRequestCreator* creator,
     const SupervisedUserService::SuccessCallback& callback) {
   creator->CreateURLAccessRequest(url, callback);
 }
 
 void CreateExtensionUpdateRequest(
-    const std::string& extension_id,
+    const std::string& id,
     PermissionRequestCreator* creator,
     const SupervisedUserService::SuccessCallback& callback) {
-  creator->CreateExtensionUpdateRequest(extension_id, callback);
+  creator->CreateExtensionUpdateRequest(id, callback);
 }
 
 #if defined(ENABLE_EXTENSIONS)
 enum ExtensionState {
   EXTENSION_FORCED,
   EXTENSION_BLOCKED,
   EXTENSION_ALLOWED
 };
 
 ExtensionState GetExtensionState(const extensions::Extension* extension) {
@@ skipping 547 matching lines @@
     const GURL& url,
     const SuccessCallback& callback) {
   AddPermissionRequestInternal(
       base::Bind(CreateURLAccessRequest,
                  SupervisedUserURLFilter::Normalize(url)),
       callback, 0);
 }
 
 void SupervisedUserService::AddExtensionUpdateRequest(
     const std::string& extension_id,
+    const base::Version& version,
     const SuccessCallback& callback) {
+  std::string id = extension_id + ":" + version.GetString();
   AddPermissionRequestInternal(
-      base::Bind(CreateExtensionUpdateRequest, extension_id),
+      base::Bind(CreateExtensionUpdateRequest, 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 266 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
 }