Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/instance_id/instance_id_driver_unittest.cc

 // Copyright 2015 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 "components/gcm_driver/instance_id/instance_id_driver.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 230 matching lines @@
   DCHECK(!async_operation_completed_);
   async_operation_completed_ = true;
   result_ = result;
   if (!async_operation_completed_callback_.is_null())
     async_operation_completed_callback_.Run();
 }
 
 TEST_F(InstanceIDDriverTest, GetAndRemoveInstanceID) {
   EXPECT_FALSE(driver()->ExistsInstanceID(kTestAppID1));
 
-  InstanceID* instance_id = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   EXPECT_TRUE(instance_id);
   EXPECT_TRUE(driver()->ExistsInstanceID(kTestAppID1));
 
   driver()->RemoveInstanceID(kTestAppID1);
   EXPECT_FALSE(driver()->ExistsInstanceID(kTestAppID1));
 }
 
 TEST_F(InstanceIDDriverTest, NewID) {
   // Creation time should not be set when the ID is not created.
-  InstanceID* instance_id1 = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id1 = driver()->GetInstanceIDForExtensions(kTestAppID1);
   EXPECT_TRUE(GetCreationTime(instance_id1).is_null());
 
   // New ID is generated for the first time.
   std::string id1 = GetID(instance_id1);
   EXPECT_TRUE(VerifyInstanceID(id1));
   base::Time creation_time = GetCreationTime(instance_id1);
   EXPECT_FALSE(creation_time.is_null());
 
   // Same ID is returned for the same app.
   EXPECT_EQ(id1, GetID(instance_id1));
   EXPECT_EQ(creation_time, GetCreationTime(instance_id1));
 
   // New ID is generated for another app.
-  InstanceID* instance_id2 = driver()->GetInstanceID(kTestAppID2);
+  InstanceID* instance_id2 = driver()->GetInstanceIDForExtensions(kTestAppID2);
   std::string id2 = GetID(instance_id2);
   EXPECT_TRUE(VerifyInstanceID(id2));
   EXPECT_NE(id1, id2);
   EXPECT_FALSE(GetCreationTime(instance_id2).is_null());
 }
 
 TEST_F(InstanceIDDriverTest, PersistID) {
-  InstanceID* instance_id = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
 
   // Create the ID for the first time. The ID and creation time should be saved
   // to the store.
   std::string id = GetID(instance_id);
   EXPECT_FALSE(id.empty());
   base::Time creation_time = GetCreationTime(instance_id);
   EXPECT_FALSE(creation_time.is_null());
 
   // Simulate restart by recreating InstanceIDDriver. Same ID and creation time
   // should be expected.
   RecreateInstanceIDDriver();
-  instance_id = driver()->GetInstanceID(kTestAppID1);
+  instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   EXPECT_EQ(creation_time, GetCreationTime(instance_id));
   EXPECT_EQ(id, GetID(instance_id));
 
   // Delete the ID. The ID and creation time should be removed from the store.
   EXPECT_EQ(InstanceID::SUCCESS, DeleteID(instance_id));
   EXPECT_TRUE(GetCreationTime(instance_id).is_null());
 
   // Simulate restart by recreating InstanceIDDriver. Different ID should be
   // expected.
   // Note that we do not check for different creation time since the test might
   // be run at a very fast server.
   RecreateInstanceIDDriver();
-  instance_id = driver()->GetInstanceID(kTestAppID1);
+  instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   EXPECT_NE(id, GetID(instance_id));
 }
 
 TEST_F(InstanceIDDriverTest, DeleteID) {
-  InstanceID* instance_id = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   std::string id1 = GetID(instance_id);
   EXPECT_FALSE(id1.empty());
   EXPECT_FALSE(GetCreationTime(instance_id).is_null());
 
   // New ID will be generated from GetID after calling DeleteID.
   EXPECT_EQ(InstanceID::SUCCESS, DeleteID(instance_id));
   EXPECT_TRUE(GetCreationTime(instance_id).is_null());
 
   std::string id2 = GetID(instance_id);
   EXPECT_FALSE(id2.empty());
   EXPECT_NE(id1, id2);
   EXPECT_FALSE(GetCreationTime(instance_id).is_null());
 }
 
 TEST_F(InstanceIDDriverTest, GetToken) {
-  InstanceID* instance_id = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   std::map<std::string, std::string> options;
   std::string token1 =
       GetToken(instance_id, kAuthorizedEntity1, kScope1, options);
   EXPECT_FALSE(token1.empty());
 
   // Same token is returned for same authorized entity and scope.
   EXPECT_EQ(token1,
             GetToken(instance_id, kAuthorizedEntity1, kScope1, options));
 
   // Different token is returned for different authorized entity or scope.
   std::string token2 =
       GetToken(instance_id, kAuthorizedEntity1, kScope2, options);
   EXPECT_FALSE(token2.empty());
   EXPECT_NE(token1, token2);
 
   std::string token3 =
       GetToken(instance_id, kAuthorizedEntity2, kScope1, options);
   EXPECT_FALSE(token3.empty());
   EXPECT_NE(token1, token3);
   EXPECT_NE(token2, token3);
 }
 
 TEST_F(InstanceIDDriverTest, DeleteToken) {
-  InstanceID* instance_id = driver()->GetInstanceID(kTestAppID1);
+  InstanceID* instance_id = driver()->GetInstanceIDForExtensions(kTestAppID1);
   std::map<std::string, std::string> options;
 
   // Gets 2 tokens.
   std::string token1 =
       GetToken(instance_id, kAuthorizedEntity1, kScope1, options);
   EXPECT_FALSE(token1.empty());
   std::string token2 =
       GetToken(instance_id, kAuthorizedEntity2, kScope1, options);
   EXPECT_FALSE(token1.empty());
   EXPECT_NE(token1, token2);
 
   // Different token is returned for same authorized entity and scope after
   // deletion.
   EXPECT_EQ(InstanceID::SUCCESS,
             DeleteToken(instance_id, kAuthorizedEntity1, kScope1));
   std::string new_token1 =
       GetToken(instance_id, kAuthorizedEntity1, kScope2, options);
   EXPECT_FALSE(new_token1.empty());
   EXPECT_NE(token1, new_token1);
 
   // The other token is not affected by the deletion.
   EXPECT_EQ(token2,
             GetToken(instance_id, kAuthorizedEntity2, kScope1, options));
 }
 
+TEST_F(InstanceIDDriverTest, GetWithAndWithoutSubtype) {
+  ASSERT_FALSE(driver()->ExistsInstanceID(kTestAppID1));
+
+  InstanceID* iid_without_subtype =
+      driver()->GetInstanceIDForExtensions(kTestAppID1);
+  ASSERT_TRUE(iid_without_subtype);
+  ASSERT_TRUE(driver()->ExistsInstanceID(kTestAppID1));
+
+  // InstanceIDDriver's caching is currently oblivious to subtypes (ideally this
+  // would DCHECK instead, since registering the same app_id in both ways is not
+  // supported).
+  InstanceID* same_iid = driver()->GetInstanceID(kTestAppID1);
+  EXPECT_TRUE(same_iid);
+  EXPECT_EQ(iid_without_subtype, same_iid);
+}
+
 }  // namespace instance_id