Supervised users: Include extension version in update requests

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 7d1a0db9c32352e7516aec32d9aa244629dbe223..d7a9dd3b2efb1dd94f1185c1e1d5ab9e13c8f0dd 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -6641,8 +6641,9 @@ class MockPermissionRequestCreator : public PermissionRequestCreator {
     FAIL();
   }
 
-  MOCK_METHOD2(CreateExtensionUpdateRequest,
+  MOCK_METHOD3(CreateExtensionUpdateRequest,
                void(const std::string& extension_id,
+                    const base::Version& version,
                     const SupervisedUserService::SuccessCallback& callback));
 
  private:
@@ -6672,6 +6673,8 @@ TEST_F(ExtensionServiceTest, SupervisedUser_InstallOnlyAllowedByCustodian) {
   EXPECT_TRUE(registry()->enabled_extensions().Contains(extensions[1]->id()));
 }
 
+MATCHER_P(EqualVersion, version, "") { return arg.Equals(version); }
+
 TEST_F(ExtensionServiceTest, SupervisedUser_UpdateWithoutPermissionIncrease) {
   ExtensionServiceInitParams params = CreateDefaultInitParams();
   params.profile_is_supervised = true;
@@ -6737,7 +6740,10 @@ TEST_F(ExtensionServiceTest, SupervisedUser_UpdateWithPermissionIncrease) {
   std::string old_version = extension->VersionString();
 
   // Update to a new version with increased permissions.
-  EXPECT_CALL(*creator, CreateExtensionUpdateRequest(id, testing::_));
+  EXPECT_CALL(*creator,
+      CreateExtensionUpdateRequest(id,
+                                   EqualVersion(base::Version("2.0.0.0")),
+                                   testing::_));
   path = base_path.AppendASCII("v2");
   PackCRXAndUpdateExtension(id, path, pem_path, DISABLED);