X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fwebui%2Fntp%2Fsuggestions_combiner_unittest.cc;h=6e5daadab02de610c752edadd92595d77418524a;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=f74b81fcba6342ade108af8647fbf5fb874d7980;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc b/src/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc index f74b81f..6e5daad 100644 --- a/src/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc +++ b/src/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc @@ -142,9 +142,7 @@ class SuggestionsSourceStub : public SuggestionsSource { number_of_suggestions_(number_of_suggestions), debug_(false) { } - virtual ~SuggestionsSourceStub() { - STLDeleteElements(&items_); - } + ~SuggestionsSourceStub() override { STLDeleteElements(&items_); } // Call this method to simulate that the SuggestionsSource has received all // its suggestions. @@ -154,16 +152,10 @@ class SuggestionsSourceStub : public SuggestionsSource { private: // SuggestionsSource Override and implementation. - virtual void SetDebug(bool enable) OVERRIDE { - debug_ = enable; - } - virtual int GetWeight() OVERRIDE { - return weight_; - } - virtual int GetItemCount() OVERRIDE { - return items_.size(); - } - virtual base::DictionaryValue* PopItem() OVERRIDE { + void SetDebug(bool enable) override { debug_ = enable; } + int GetWeight() override { return weight_; } + int GetItemCount() override { return items_.size(); } + base::DictionaryValue* PopItem() override { if (items_.empty()) return NULL; base::DictionaryValue* item = items_.front(); @@ -171,7 +163,7 @@ class SuggestionsSourceStub : public SuggestionsSource { return item; } - virtual void FetchItems(Profile* profile) OVERRIDE { + void FetchItems(Profile* profile) override { char num_str[21]; // Enough to hold all numbers up to 64-bits. for (int i = 0; i < number_of_suggestions_; ++i) { base::snprintf(num_str, sizeof(num_str), "%d", i); @@ -187,7 +179,7 @@ class SuggestionsSourceStub : public SuggestionsSource { items_.push_back(item); } - virtual void SetCombiner(SuggestionsCombiner* combiner) OVERRIDE { + void SetCombiner(SuggestionsCombiner* combiner) override { DCHECK(!combiner_); combiner_ = combiner; } @@ -222,13 +214,13 @@ class SuggestionsCombinerTest : public testing::Test { } private: - virtual void SetUp() { + void SetUp() override { profile_ = new TestingProfile(); suggestions_handler_ = new SuggestionsHandler(); combiner_ = new SuggestionsCombiner(suggestions_handler_, profile_); } - virtual void TearDown() { + void TearDown() override { delete combiner_; delete suggestions_handler_; delete profile_;