Change ImageStore to use SequenceChecker instead of ThreadChecker.

    
We will be using ImageStore with
BrowserThread::PostBlockingPoolSequencedTask which doesn't always
guarantee same thread execution.
    
BUG=368034

Review URL: https://codereview.chromium.org/288573003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270801 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 20 deletions

diff --git a/components/enhanced_bookmarks/image_store.cc b/components/enhanced_bookmarks/image_store.cc
index 3b58b0a..a7e32e2 100644
--- a/components/enhanced_bookmarks/image_store.cc
+++ b/components/enhanced_bookmarks/image_store.cc
@@ -13,7 +13,7 @@ ImageStore::~ImageStore() {
 }
 
 void ImageStore::ChangeImageURL(const GURL& from, const GURL& to) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   if (!HasKey(from))
     return;
diff --git a/components/enhanced_bookmarks/image_store.h b/components/enhanced_bookmarks/image_store.h
index 46ca138..a7c7a15 100644
--- a/components/enhanced_bookmarks/image_store.h
+++ b/components/enhanced_bookmarks/image_store.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <set>
 
-#include "base/threading/thread_checker.h"
+#include "base/sequence_checker.h"
 #include "ui/gfx/image/image.h"
 
 class GURL;
@@ -53,7 +53,7 @@ class ImageStore {
   void ChangeImageURL(const GURL& from, const GURL& to);
 
  protected:
-  base::ThreadChecker thread_checker_;
+  base::SequenceChecker sequence_checker_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ImageStore);
diff --git a/components/enhanced_bookmarks/persistent_image_store.cc b/components/enhanced_bookmarks/persistent_image_store.cc
index 49c062a..5e42f35 100644
--- a/components/enhanced_bookmarks/persistent_image_store.cc
+++ b/components/enhanced_bookmarks/persistent_image_store.cc
@@ -76,7 +76,7 @@ PersistentImageStore::PersistentImageStore(const base::FilePath& path)
 }
 
 bool PersistentImageStore::HasKey(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return false;
 
@@ -92,7 +92,7 @@ bool PersistentImageStore::HasKey(const GURL& page_url) {
 void PersistentImageStore::Insert(const GURL& page_url,
                                   const GURL& image_url,
                                   const gfx::Image& image) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return;
 
@@ -122,7 +122,7 @@ void PersistentImageStore::Insert(const GURL& page_url,
 }
 
 void PersistentImageStore::Erase(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return;
 
@@ -133,7 +133,7 @@ void PersistentImageStore::Erase(const GURL& page_url) {
 }
 
 std::pair<gfx::Image, GURL> PersistentImageStore::Get(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return std::make_pair(gfx::Image(), GURL());
 
@@ -156,7 +156,7 @@ std::pair<gfx::Image, GURL> PersistentImageStore::Get(const GURL& page_url) {
 }
 
 gfx::Size PersistentImageStore::GetSize(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return gfx::Size();
 
@@ -176,7 +176,7 @@ gfx::Size PersistentImageStore::GetSize(const GURL& page_url) {
 }
 
 void PersistentImageStore::GetAllPageUrls(std::set<GURL>* urls) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(urls->empty());
   if (OpenDatabase() != sql::INIT_OK)
     return;
@@ -188,7 +188,7 @@ void PersistentImageStore::GetAllPageUrls(std::set<GURL>* urls) {
 }
 
 void PersistentImageStore::ClearAll() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (OpenDatabase() != sql::INIT_OK)
     return;
 
@@ -198,11 +198,11 @@ void PersistentImageStore::ClearAll() {
 }
 
 PersistentImageStore::~PersistentImageStore() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 }
 
 sql::InitStatus PersistentImageStore::OpenDatabase() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   if (db_.is_open())
     return sql::INIT_OK;
diff --git a/components/enhanced_bookmarks/test_image_store.cc b/components/enhanced_bookmarks/test_image_store.cc
index dacb7c9..c96f3cf 100644
--- a/components/enhanced_bookmarks/test_image_store.cc
+++ b/components/enhanced_bookmarks/test_image_store.cc
@@ -11,7 +11,7 @@ TestImageStore::TestImageStore() {
 }
 
 bool TestImageStore::HasKey(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   return store_.find(page_url) != store_.end();
 }
@@ -19,7 +19,7 @@ bool TestImageStore::HasKey(const GURL& page_url) {
 void TestImageStore::Insert(const GURL& page_url,
                               const GURL& image_url,
                               const gfx::Image& image) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   Erase(page_url);
   store_.insert(std::make_pair(
@@ -29,13 +29,13 @@ void TestImageStore::Insert(const GURL& page_url,
 }
 
 void TestImageStore::Erase(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   store_.erase(page_url);
 }
 
 std::pair<gfx::Image, GURL> TestImageStore::Get(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   ImageMap::const_iterator pair_enumerator = store_.find(page_url);
   if (pair_enumerator == store_.end())
@@ -45,7 +45,7 @@ std::pair<gfx::Image, GURL> TestImageStore::Get(const GURL& page_url) {
 }
 
 gfx::Size TestImageStore::GetSize(const GURL& page_url) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   ImageMap::const_iterator pair_enumerator = store_.find(page_url);
   if (pair_enumerator == store_.end())
@@ -55,7 +55,7 @@ gfx::Size TestImageStore::GetSize(const GURL& page_url) {
 }
 
 void TestImageStore::GetAllPageUrls(std::set<GURL>* urls) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(urls->empty());
 
   for (ImageMap::const_iterator it = store_.begin(); it != store_.end(); ++it)
@@ -63,11 +63,11 @@ void TestImageStore::GetAllPageUrls(std::set<GURL>* urls) {
 }
 
 void TestImageStore::ClearAll() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   store_.clear();
 }
 
 TestImageStore::~TestImageStore() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 }