Migrate GCMKeyStore and InkDropImpl tests to use EXPECT_DCHECK_DEATH.

ui/views/animation/ink_drop_impl_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 <memory>
 
 #include "ui/views/animation/ink_drop_impl.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/test/gtest_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/views/animation/test/ink_drop_impl_test_api.h"
 #include "ui/views/animation/test/test_ink_drop_host.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace views {
 
@@ skipping 204 matching lines @@
 
   test_api()->CompleteAnimations();
 
   ink_drop()->SetHovered(false);
   EXPECT_TRUE(AreLayersAddedToHost());
 
   ink_drop()->SetHovered(true);
   EXPECT_TRUE(AreLayersAddedToHost());
 }
 
-#if DCHECK_IS_ON()
 TEST_F(InkDropImplTest,
        SettingHighlightStateDuringStateExitIsntAllowedDeathTest) {
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
 
   test::InkDropImplTestApi::SetStateOnExitHighlightState::Install(
       test_api()->state_factory());
-  ASSERT_DEATH_IF_SUPPORTED(
+  EXPECT_DCHECK_DEATH(
       test::InkDropImplTestApi::AccessFactoryOnExitHighlightState::Install(
-          test_api()->state_factory()),
-      ".*HighlightStates should not be changed within a call to "
-      "HighlightState::Exit\\(\\)\\..*");
+          test_api()->state_factory()));
   // Need to set the |highlight_state_| directly because the
   // SetStateOnExitHighlightState will recursively try to set it during tear
   // down and cause a stack overflow.
   test_api()->SetHighlightState(nullptr);
 }
-#endif
 
 // Verifies there is no use after free errors.
 TEST_F(InkDropImplTest,
        TearingDownHighlightStateThatAccessesTheStateFactoryIsSafe) {
   test::InkDropImplTestApi::AccessFactoryOnExitHighlightState::Install(
       test_api()->state_factory());
   test::InkDropImplTestApi::AccessFactoryOnExitHighlightState::Install(
       test_api()->state_factory());
 }
 
@@ skipping 300 matching lines @@
   EXPECT_TRUE(test_api()->IsHighlightFadingInOrVisible());
 
   ink_drop()->SetHovered(false);
   ink_drop()->SetFocused(false);
 
   EXPECT_TRUE(test_api()->IsHighlightFadingInOrVisible());
   EXPECT_FALSE(test_api()->ShouldHighlight());
 }
 
 }  // namespace views