Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / search_box_view_unittest.cc

diff --git a/src/ui/app_list/views/search_box_view_unittest.cc b/src/ui/app_list/views/search_box_view_unittest.cc
index 3d3ca35..db87891 100644 (file)
--- a/src/ui/app_list/views/search_box_view_unittest.cc
+++ b/src/ui/app_list/views/search_box_view_unittest.cc
@@ -19,7 +19,7 @@ namespace test {
 class KeyPressCounterView : public views::View {
  public:
   KeyPressCounterView() : count_(0) {}
-  virtual ~KeyPressCounterView() {}
+  ~KeyPressCounterView() override {}
 
   int GetCountAndReset() {
     int count = count_;
@@ -29,7 +29,7 @@ class KeyPressCounterView : public views::View {
 
  private:
   // Overridden from views::View:
-  virtual bool OnKeyPressed(const ui::KeyEvent& key_event) OVERRIDE {
+  bool OnKeyPressed(const ui::KeyEvent& key_event) override {
     if (!::isalnum(static_cast<int>(key_event.key_code()))) {
       ++count_;
       return true;
@@ -45,10 +45,10 @@ class SearchBoxViewTest : public views::test::WidgetTest,
                           public SearchBoxViewDelegate {
  public:
   SearchBoxViewTest() : query_changed_count_(0) {}
-  virtual ~SearchBoxViewTest() {}
+  ~SearchBoxViewTest() override {}
 
   // Overridden from testing::Test:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     views::test::WidgetTest::SetUp();
     widget_ = CreateTopLevelPlatformWidget();
     view_ = new SearchBoxView(this, &view_delegate_);
@@ -58,7 +58,7 @@ class SearchBoxViewTest : public views::test::WidgetTest,
     view_->set_contents_view(counter_view_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     widget_->CloseNow();
     views::test::WidgetTest::TearDown();
   }
@@ -84,7 +84,7 @@ class SearchBoxViewTest : public views::test::WidgetTest,
   }
 
   void KeyPress(ui::KeyboardCode key_code) {
-    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE, true);
+    ui::KeyEvent event(ui::ET_KEY_PRESSED, key_code, ui::EF_NONE);
     view_->search_box()->OnKeyPressed(event);
     // Emulates the input method.
     if (::isalnum(static_cast<int>(key_code))) {
@@ -107,7 +107,7 @@ class SearchBoxViewTest : public views::test::WidgetTest,
 
  private:
   // Overridden from SearchBoxViewDelegate:
-  virtual void QueryChanged(SearchBoxView* sender) OVERRIDE {
+  void QueryChanged(SearchBoxView* sender) override {
     ++query_changed_count_;
     last_query_ = sender->search_box()->text();
   }