Supervised users: Include extension version in update requests

chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.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/child_accounts/permission_request_creator_apiary.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "base/version.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ skipping 87 matching lines @@
 }
 
 void PermissionRequestCreatorApiary::CreateURLAccessRequest(
     const GURL& url_requested,
     const SuccessCallback& callback) {
   CreateRequest(kNamespaceURLRequest, url_requested.spec(), callback);
 }
 
 void PermissionRequestCreatorApiary::CreateExtensionUpdateRequest(
     const std::string& extension_id,
+    const base::Version& version,
     const SuccessCallback& callback) {
-  CreateRequest(kNamespaceUpdateRequest, extension_id, callback);
+  std::string object_ref = extension_id + ":" + version.GetString();

[Bernhard Bauer, 2015/03/23 16:18:39]

BTW, is there a reason why this is part of the PermissionRequestCreator
interface and therefore has to be repeated with every implementation, instead of
moving it to SupervisedUserService?

[Marc Treib, 2015/03/23 16:26:46]

I'd say it's only by coincidence that both PRC implementations handle this the
same way.

[Bernhard Bauer, 2015/03/23 16:51:48]

Really? IMO it's fair to say that what we are abstracting away behind the PRC
interface is *how* we talk to the permission request server, not the server
itself, so all PRC implementations can use a shared format to encode their
requests. 

[Marc Treib, 2015/03/24 14:48:03]

Done.

+  CreateRequest(kNamespaceUpdateRequest, object_ref, callback);
 }
 
 GURL PermissionRequestCreatorApiary::GetApiUrl() const {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPermissionRequestApiUrl)) {
     GURL url(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kPermissionRequestApiUrl));
     LOG_IF(WARNING, !url.is_valid())
         << "Got invalid URL for " << switches::kPermissionRequestApiUrl;
     return url;
@@ skipping 143 matching lines @@
       it, GoogleServiceAuthError::FromConnectionError(error_code));
 }
 
 void PermissionRequestCreatorApiary::DispatchGoogleServiceAuthError(
     RequestIterator it,
     const GoogleServiceAuthError& error) {
   VLOG(1) << "GoogleServiceAuthError: " << error.ToString();
   (*it)->callback.Run(false);
   requests_.erase(it);
 }