Migrate GCMKeyStore and InkDropImpl tests to use EXPECT_DCHECK_DEATH.

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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/gtest_util.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/gcm_driver/crypto/p256_key_util.h"
-#include "net/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
 const char kFakeAppId[] = "my_app_id";
 const char kSecondFakeAppId[] = "my_other_app_id";
 const char kFakeAuthorizedEntity[] = "my_sender_id";
 const char kSecondFakeAuthorizedEntity[] = "my_other_sender_id";
@@ skipping 478 matching lines @@
   EXPECT_FALSE(read_pair.IsInitialized());
 
   // Now run the message loop. Both tasks should have finished executing. Due
   // 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());
 }
 
-#if !defined(NDEBUG) && DCHECK_IS_ON()
-
 TEST_F(GCMKeyStoreTest, CannotShareAppIdFromGCMToInstanceID) {
   KeyPair pair_unused;
   std::string auth_secret_unused;
   gcm_key_store()->CreateKeys(
       kFakeAppId, "" /* empty authorized entity for non-InstanceID */,
       base::Bind(&GCMKeyStoreTest::GotKeys, base::Unretained(this),
                  &pair_unused, &auth_secret_unused));
 
   base::RunLoop().RunUntilIdle();
 
-  static_assert(logging::LOG_DCHECK == logging::LOG_DFATAL,
-                "Unless these are equal, EXPECT_DFATAL will miss the DCHECK");
-  EXPECT_DFATAL(
+  EXPECT_DCHECK_DEATH(
       {
         gcm_key_store()->CreateKeys(
             kFakeAppId, kFakeAuthorizedEntity,
             base::Bind(&GCMKeyStoreTest::GotKeys, base::Unretained(this),
                        &pair_unused, &auth_secret_unused));
 
         base::RunLoop().RunUntilIdle();
-      },
-      "Instance ID tokens cannot share an app_id with a non-InstanceID GCM "
-      "registration");
+      });
 }
 
 TEST_F(GCMKeyStoreTest, CannotShareAppIdFromInstanceIDToGCM) {
   KeyPair pair_unused;
   std::string auth_secret_unused;
   gcm_key_store()->CreateKeys(
       kFakeAppId, kFakeAuthorizedEntity,
       base::Bind(&GCMKeyStoreTest::GotKeys, base::Unretained(this),
                  &pair_unused, &auth_secret_unused));
 
   base::RunLoop().RunUntilIdle();
 
   gcm_key_store()->CreateKeys(
       kFakeAppId, kSecondFakeAuthorizedEntity,
       base::Bind(&GCMKeyStoreTest::GotKeys, base::Unretained(this),
                  &pair_unused, &auth_secret_unused));
 
   base::RunLoop().RunUntilIdle();
 
-  static_assert(logging::LOG_DCHECK == logging::LOG_DFATAL,
-                "Unless these are equal, EXPECT_DFATAL will miss the DCHECK");
-  EXPECT_DFATAL(
+  EXPECT_DCHECK_DEATH(
       {
         gcm_key_store()->CreateKeys(
             kFakeAppId, "" /* empty authorized entity for non-InstanceID */,
             base::Bind(&GCMKeyStoreTest::GotKeys, base::Unretained(this),
                        &pair_unused, &auth_secret_unused));
 
         base::RunLoop().RunUntilIdle();
-      },
-      "Instance ID tokens cannot share an app_id with a non-InstanceID GCM "
-      "registration");
+      });
 }
 
-#endif  // !defined(NDEBUG) && DCHECK_IS_ON()
-
 }  // namespace
 
 }  // namespace gcm