Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: components/enhanced_bookmarks/test_image_store.cc

Issue 288573003: Change ImageStore to use SequenceChecker instead of ThreadChecker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git log Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/enhanced_bookmarks/persistent_image_store.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/enhanced_bookmarks/test_image_store.h" 5 #include "components/enhanced_bookmarks/test_image_store.h"
6 6
7 #include "ui/gfx/geometry/size.h" 7 #include "ui/gfx/geometry/size.h"
8 #include "url/gurl.h" 8 #include "url/gurl.h"
9 9
10 TestImageStore::TestImageStore() { 10 TestImageStore::TestImageStore() {
11 } 11 }
12 12
13 bool TestImageStore::HasKey(const GURL& page_url) { 13 bool TestImageStore::HasKey(const GURL& page_url) {
14 DCHECK(thread_checker_.CalledOnValidThread()); 14 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
15 15
16 return store_.find(page_url) != store_.end(); 16 return store_.find(page_url) != store_.end();
17 } 17 }
18 18
19 void TestImageStore::Insert(const GURL& page_url, 19 void TestImageStore::Insert(const GURL& page_url,
20 const GURL& image_url, 20 const GURL& image_url,
21 const gfx::Image& image) { 21 const gfx::Image& image) {
22 DCHECK(thread_checker_.CalledOnValidThread()); 22 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
23 23
24 Erase(page_url); 24 Erase(page_url);
25 store_.insert(std::make_pair( 25 store_.insert(std::make_pair(
26 page_url, 26 page_url,
27 std::make_pair(image, 27 std::make_pair(image,
28 image_url))); 28 image_url)));
29 } 29 }
30 30
31 void TestImageStore::Erase(const GURL& page_url) { 31 void TestImageStore::Erase(const GURL& page_url) {
32 DCHECK(thread_checker_.CalledOnValidThread()); 32 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
33 33
34 store_.erase(page_url); 34 store_.erase(page_url);
35 } 35 }
36 36
37 std::pair<gfx::Image, GURL> TestImageStore::Get(const GURL& page_url) { 37 std::pair<gfx::Image, GURL> TestImageStore::Get(const GURL& page_url) {
38 DCHECK(thread_checker_.CalledOnValidThread()); 38 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
39 39
40 ImageMap::const_iterator pair_enumerator = store_.find(page_url); 40 ImageMap::const_iterator pair_enumerator = store_.find(page_url);
41 if (pair_enumerator == store_.end()) 41 if (pair_enumerator == store_.end())
42 return std::make_pair(gfx::Image(), GURL()); 42 return std::make_pair(gfx::Image(), GURL());
43 43
44 return std::make_pair(store_[page_url].first, store_[page_url].second); 44 return std::make_pair(store_[page_url].first, store_[page_url].second);
45 } 45 }
46 46
47 gfx::Size TestImageStore::GetSize(const GURL& page_url) { 47 gfx::Size TestImageStore::GetSize(const GURL& page_url) {
48 DCHECK(thread_checker_.CalledOnValidThread()); 48 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
49 49
50 ImageMap::const_iterator pair_enumerator = store_.find(page_url); 50 ImageMap::const_iterator pair_enumerator = store_.find(page_url);
51 if (pair_enumerator == store_.end()) 51 if (pair_enumerator == store_.end())
52 return gfx::Size(); 52 return gfx::Size();
53 53
54 return store_[page_url].first.Size(); 54 return store_[page_url].first.Size();
55 } 55 }
56 56
57 void TestImageStore::GetAllPageUrls(std::set<GURL>* urls) { 57 void TestImageStore::GetAllPageUrls(std::set<GURL>* urls) {
58 DCHECK(thread_checker_.CalledOnValidThread()); 58 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
59 DCHECK(urls->empty()); 59 DCHECK(urls->empty());
60 60
61 for (ImageMap::const_iterator it = store_.begin(); it != store_.end(); ++it) 61 for (ImageMap::const_iterator it = store_.begin(); it != store_.end(); ++it)
62 urls->insert(it->first); 62 urls->insert(it->first);
63 } 63 }
64 64
65 void TestImageStore::ClearAll() { 65 void TestImageStore::ClearAll() {
66 DCHECK(thread_checker_.CalledOnValidThread()); 66 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
67 67
68 store_.clear(); 68 store_.clear();
69 } 69 }
70 70
71 TestImageStore::~TestImageStore() { 71 TestImageStore::~TestImageStore() {
72 DCHECK(thread_checker_.CalledOnValidThread()); 72 DCHECK(sequence_checker_.CalledOnValidSequencedThread());
73 } 73 }
OLDNEW
« no previous file with comments | « components/enhanced_bookmarks/persistent_image_store.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698