Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / ntp / suggestions_combiner_unittest.cc

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 (file)
--- 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_;