Fix GCMKeyStore interleaved request handling

components/gcm_driver/crypto/gcm_key_store_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/crypto/gcm_key_store.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 193 matching lines @@
   gcm_key_store()->GetKeys(kFakeAppId,
                            base::Bind(&GCMKeyStoreTest::GotKeys,
                                       base::Unretained(this), &read_pair,
                                       &read_auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_FALSE(read_pair.IsInitialized());
 }
 
+TEST_F(GCMKeyStoreTest, CreateAndRemoveKeysSynchronously) {
+  KeyPair pair;
+  std::string auth_secret;
+  gcm_key_store()->CreateKeys(kFakeAppId,
+                              base::Bind(&GCMKeyStoreTest::GotKeys,
+                                         base::Unretained(this), &pair,
+                                         &auth_secret));
+
+  // Continue synchronously, without running RunUntilIdle first.
+  gcm_key_store()->RemoveKeys(kFakeAppId, base::Bind(&base::DoNothing));
+
+  base::RunLoop().RunUntilIdle();
+
+  ASSERT_TRUE(pair.IsInitialized());
+  EXPECT_TRUE(pair.has_type());
+
+  histogram_tester()->ExpectBucketCount(
+      "GCM.Crypto.RemoveKeySuccessRate", 1, 1);  // success
+
+  KeyPair read_pair;
+  std::string read_auth_secret;
+  gcm_key_store()->GetKeys(kFakeAppId,
+                           base::Bind(&GCMKeyStoreTest::GotKeys,
+                                      base::Unretained(this), &read_pair,
+                                      &read_auth_secret));
+
+  base::RunLoop().RunUntilIdle();
+
+  ASSERT_FALSE(read_pair.IsInitialized());
+}
+
 TEST_F(GCMKeyStoreTest, GetKeysMultipleAppIds) {
   KeyPair pair;
   std::string auth_secret;
   gcm_key_store()->CreateKeys(kFakeAppId,
                               base::Bind(&GCMKeyStoreTest::GotKeys,
                                          base::Unretained(this), &pair,
                                          &auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
@@ skipping 46 matching lines @@
   // to the asynchronous nature of operations, however, we can't rely on the
   // write to have finished before the read begins.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(pair.IsInitialized());
 }
 
 }  // namespace
 
 }  // namespace gcm