Replace ENABLE_NON_THREAD_SAFE with DCHECK_IS_ON() in image_skia_unittest.cc

ui/gfx/image/image_skia_unittest.cc

 // Copyright (c) 2012 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 "ui/gfx/image/image_skia.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/threading/simple_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/switches.h"
 
-// Duplicated from base/threading/non_thread_safe.h so that we can be
-// good citizens there and undef the macro.
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
-#define ENABLE_NON_THREAD_SAFE 1
-#else
-#define ENABLE_NON_THREAD_SAFE 0
-#endif
-
 namespace gfx {
 
 namespace {
 
 class FixedSource : public ImageSkiaSource {
  public:
   explicit FixedSource(const ImageSkiaRep& image) : image_(image) {}
 
   ~FixedSource() override {}
 
@@ skipping 310 matching lines @@
   ImageSkia copy = image;
   copy.AddRepresentation(gfx::ImageSkiaRep(gfx::Size(10, 10),
                                            2.0f));
   unrelated.AddRepresentation(gfx::ImageSkiaRep(gfx::Size(10, 10),
                                                 1.0f));
   EXPECT_TRUE(image.BackedBySameObjectAs(copy));
   EXPECT_FALSE(image.BackedBySameObjectAs(unrelated));
   EXPECT_FALSE(copy.BackedBySameObjectAs(unrelated));
 }
 
-#if ENABLE_NON_THREAD_SAFE
+#if DCHECK_IS_ON()
 TEST_F(ImageSkiaTest, EmptyOnThreadTest) {
   ImageSkia empty;
   test::TestOnThread empty_on_thread(&empty);
   empty_on_thread.Start();
   empty_on_thread.Join();
   EXPECT_TRUE(empty_on_thread.can_read());
   EXPECT_TRUE(empty_on_thread.can_modify());
 }
 
 TEST_F(ImageSkiaTest, StaticOnThreadTest) {
@@ skipping 105 matching lines @@
   // Check if image reps are generated for supported scale factors.
   EXPECT_EQ(ImageSkia::GetSupportedScales().size(),
            image.image_reps().size());
   test::TestOnThread threadsafe_on_thread(&image);
   threadsafe_on_thread.StartAndJoin();
   EXPECT_TRUE(threadsafe_on_thread.can_read());
   EXPECT_FALSE(threadsafe_on_thread.can_modify());
   EXPECT_TRUE(image.CanRead());
   EXPECT_FALSE(image.CanModify());
 }
-#endif  // ENABLE_NON_THREAD_SAFE
-
-// Just in case we ever get lumped together with other compilation units.
-#undef ENABLE_NON_THREAD_SAFE
+#endif  // DCHECK_IS_ON()
 
 TEST_F(ImageSkiaTest, Unscaled) {
   SkBitmap bitmap;
 
   // An ImageSkia created with 1x bitmap is unscaled.
   ImageSkia image_skia = ImageSkia::CreateFrom1xBitmap(bitmap);
   EXPECT_TRUE(image_skia.GetRepresentation(1.0f).unscaled());
   ImageSkiaRep rep_2x(Size(100, 100), 2.0f);
 
   // When reps for other scales are added, the unscaled image
@@ skipping 125 matching lines @@
   EXPECT_EQ(1U, image.image_reps().size());
 
   const ImageSkiaRep& rep12 = image.GetRepresentation(1.2f);
   EXPECT_EQ(1.0f, rep12.scale());
   EXPECT_EQ("100x200", rep12.pixel_size().ToString());
   EXPECT_TRUE(rep12.unscaled());
   EXPECT_EQ(1U, image.image_reps().size());
 }
 
 }  // namespace gfx