Replace deprecated base::NonThreadSafe in ui\gfx\image_skia.cc in favor of SequenceChecker.

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"
@@ skipping 360 matching lines @@
 
   test::TestOnThread image_on_thread(&image);
   // an image that was never accessed on this thread can be
   // read by other thread.
   image_on_thread.StartAndJoin();
   EXPECT_TRUE(image_on_thread.can_read());
   EXPECT_TRUE(image_on_thread.can_modify());
   EXPECT_FALSE(image.CanRead());
   EXPECT_FALSE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   // An image is accessed by this thread,
   // so other thread cannot read/modify it.
   image.image_reps();
   test::TestOnThread image_on_thread2(&image);
   image_on_thread2.StartAndJoin();
   EXPECT_FALSE(image_on_thread2.can_read());
   EXPECT_FALSE(image_on_thread2.can_modify());
   EXPECT_TRUE(image.CanRead());
   EXPECT_TRUE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   std::unique_ptr<ImageSkia> deep_copy(image.DeepCopy());
   EXPECT_FALSE(deep_copy->IsThreadSafe());
   test::TestOnThread deepcopy_on_thread(deep_copy.get());
   deepcopy_on_thread.StartAndJoin();
   EXPECT_TRUE(deepcopy_on_thread.can_read());
   EXPECT_TRUE(deepcopy_on_thread.can_modify());
   EXPECT_FALSE(deep_copy->CanRead());
   EXPECT_FALSE(deep_copy->CanModify());
 
   std::unique_ptr<ImageSkia> deep_copy2(image.DeepCopy());
   EXPECT_EQ(1U, deep_copy2->image_reps().size());
   // Access it from current thread so that it can't be
   // accessed from another thread.
   deep_copy2->image_reps();
   EXPECT_FALSE(deep_copy2->IsThreadSafe());
   test::TestOnThread deepcopy2_on_thread(deep_copy2.get());
   deepcopy2_on_thread.StartAndJoin();
   EXPECT_FALSE(deepcopy2_on_thread.can_read());
   EXPECT_FALSE(deepcopy2_on_thread.can_modify());
   EXPECT_TRUE(deep_copy2->CanRead());
   EXPECT_TRUE(deep_copy2->CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   image.SetReadOnly();
   // A read-only ImageSkia with no source is thread safe.
   EXPECT_TRUE(image.IsThreadSafe());
   test::TestOnThread readonly_on_thread(&image);
   readonly_on_thread.StartAndJoin();
   EXPECT_TRUE(readonly_on_thread.can_read());
   EXPECT_FALSE(readonly_on_thread.can_modify());
   EXPECT_TRUE(image.CanRead());
   EXPECT_FALSE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   image.MakeThreadSafe();
   EXPECT_TRUE(image.IsThreadSafe());
   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());
 }
 
 TEST_F(ImageSkiaTest, SourceOnThreadTest) {
   ImageSkia image(new DynamicSource(Size(100, 200)), Size(100, 200));
   EXPECT_FALSE(image.IsThreadSafe());
 
   test::TestOnThread image_on_thread(&image);
   image_on_thread.StartAndJoin();
   // an image that was never accessed on this thread can be
   // read by other thread.
   EXPECT_TRUE(image_on_thread.can_read());
   EXPECT_TRUE(image_on_thread.can_modify());
   EXPECT_FALSE(image.CanRead());
   EXPECT_FALSE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   // An image is accessed by this thread,
   // so other thread cannot read/modify it.
   image.image_reps();
   test::TestOnThread image_on_thread2(&image);
   image_on_thread2.StartAndJoin();
   EXPECT_FALSE(image_on_thread2.can_read());
   EXPECT_FALSE(image_on_thread2.can_modify());
   EXPECT_TRUE(image.CanRead());
   EXPECT_TRUE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   image.SetReadOnly();
   EXPECT_FALSE(image.IsThreadSafe());
   test::TestOnThread readonly_on_thread(&image);
   readonly_on_thread.StartAndJoin();
   EXPECT_TRUE(readonly_on_thread.can_read());
   EXPECT_FALSE(readonly_on_thread.can_modify());
   EXPECT_FALSE(image.CanRead());
   EXPECT_FALSE(image.CanModify());
 
-  image.DetachStorageFromThread();
+  image.DetachStorageFromSequence();
   image.MakeThreadSafe();
   EXPECT_TRUE(image.IsThreadSafe());
   // 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());
@@ skipping 141 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