summaryrefslogtreecommitdiffstats
path: root/components/suggestions
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 08:04:46 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 15:05:09 +0000
commitfe59f48c251e124f4b896e589cb635979bb2f1fb (patch)
tree7b07cb56427dfe63f2775683555da84a557aeb90 /components/suggestions
parent4749549c06525071692f777fc6a1fa5a9ad7f877 (diff)
downloadchromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.zip
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.gz
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.bz2
replace OVERRIDE and FINAL with override and final in components/
BUG=417463 Review URL: https://codereview.chromium.org/623133002 Cr-Commit-Position: refs/heads/master@{#298237}
Diffstat (limited to 'components/suggestions')
-rw-r--r--components/suggestions/blacklist_store_unittest.cc2
-rw-r--r--components/suggestions/image_manager.h2
-rw-r--r--components/suggestions/image_manager_unittest.cc4
-rw-r--r--components/suggestions/suggestions_service.h4
-rw-r--r--components/suggestions/suggestions_service_unittest.cc2
-rw-r--r--components/suggestions/suggestions_store_unittest.cc2
6 files changed, 8 insertions, 8 deletions
diff --git a/components/suggestions/blacklist_store_unittest.cc b/components/suggestions/blacklist_store_unittest.cc
index 63d0611..16daaff 100644
--- a/components/suggestions/blacklist_store_unittest.cc
+++ b/components/suggestions/blacklist_store_unittest.cc
@@ -55,7 +55,7 @@ class BlacklistStoreTest : public testing::Test {
BlacklistStoreTest()
: pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
BlacklistStore::RegisterProfilePrefs(pref_service()->registry());
}
diff --git a/components/suggestions/image_manager.h b/components/suggestions/image_manager.h
index e538a6b..02ec268 100644
--- a/components/suggestions/image_manager.h
+++ b/components/suggestions/image_manager.h
@@ -51,7 +51,7 @@ class ImageManager : public ImageFetcherDelegate {
protected:
// Perform additional tasks when an image has been fetched.
- virtual void OnImageFetched(const GURL& url, const SkBitmap* bitmap) OVERRIDE;
+ virtual void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override;
private:
friend class MockImageManager;
diff --git a/components/suggestions/image_manager_unittest.cc b/components/suggestions/image_manager_unittest.cc
index b6182d8..57dd8bf 100644
--- a/components/suggestions/image_manager_unittest.cc
+++ b/components/suggestions/image_manager_unittest.cc
@@ -53,12 +53,12 @@ class ImageManagerTest : public testing::Test {
num_callback_null_called_(0),
num_callback_valid_called_(0) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
fake_db_ = new FakeDB<ImageData>(&db_model_);
image_manager_.reset(CreateImageManager(fake_db_));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
fake_db_ = NULL;
db_model_.clear();
image_manager_.reset();
diff --git a/components/suggestions/suggestions_service.h b/components/suggestions/suggestions_service.h
index aa30ba2..ea385e1 100644
--- a/components/suggestions/suggestions_service.h
+++ b/components/suggestions/suggestions_service.h
@@ -124,10 +124,10 @@ class SuggestionsService : public KeyedService, public net::URLFetcherDelegate {
// net::URLFetcherDelegate implementation.
// Called when fetch request completes. Parses the received suggestions data,
// and dispatches them to callbacks stored in queue.
- virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
// KeyedService implementation.
- virtual void Shutdown() OVERRIDE;
+ virtual void Shutdown() override;
// Load the cached suggestions and service the requestors with them.
void ServeFromCache();
diff --git a/components/suggestions/suggestions_service_unittest.cc b/components/suggestions/suggestions_service_unittest.cc
index ae9aa91..7c68373 100644
--- a/components/suggestions/suggestions_service_unittest.cc
+++ b/components/suggestions/suggestions_service_unittest.cc
@@ -165,7 +165,7 @@ class SuggestionsServiceTest : public testing::Test {
virtual ~SuggestionsServiceTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
request_context_ = new net::TestURLRequestContextGetter(
io_message_loop_.message_loop_proxy());
}
diff --git a/components/suggestions/suggestions_store_unittest.cc b/components/suggestions/suggestions_store_unittest.cc
index 1b7ebfc..d66f466 100644
--- a/components/suggestions/suggestions_store_unittest.cc
+++ b/components/suggestions/suggestions_store_unittest.cc
@@ -74,7 +74,7 @@ class SuggestionsStoreTest : public testing::Test {
SuggestionsStoreTest()
: pref_service_(new user_prefs::TestingPrefServiceSyncable) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
SuggestionsStore::RegisterProfilePrefs(pref_service_->registry());
suggestions_store_.reset(new SuggestionsStore(pref_service_.get()));
}