replace OVERRIDE and FINAL with override and final in ui/

ui/views/window/dialog_client_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 class TestDialogClientView : public DialogClientView {
  public:
   TestDialogClientView(View* contents_view,
                        DialogDelegate* dialog_delegate)
       : DialogClientView(contents_view),
         dialog_(dialog_delegate) {}
   virtual ~TestDialogClientView() {}
 
   // DialogClientView implementation.
-  virtual DialogDelegate* GetDialogDelegate() const OVERRIDE { return dialog_; }
+  virtual DialogDelegate* GetDialogDelegate() const override { return dialog_; }
 
   View* GetContentsView() { return contents_view(); }
 
   void CreateExtraViews() {
     CreateExtraView();
     CreateFootnoteView();
   }
 
  private:
   DialogDelegate* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDialogClientView);
 };
 
 class DialogClientViewTest : public ViewsTestBase,
                              public DialogDelegateView {
  public:
   DialogClientViewTest()
       : dialog_buttons_(ui::DIALOG_BUTTON_NONE),
         extra_view_(NULL),
         footnote_view_(NULL) {}
   virtual ~DialogClientViewTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
     contents_.reset(new StaticSizedView(gfx::Size(100, 200)));
     client_view_.reset(new TestDialogClientView(contents_.get(), this));
 
     ViewsTestBase::SetUp();
   }
 
   // DialogDelegateView implementation.
-  virtual View* GetContentsView() OVERRIDE { return contents_.get(); }
-  virtual View* CreateExtraView() OVERRIDE { return extra_view_; }
-  virtual View* CreateFootnoteView() OVERRIDE { return footnote_view_; }
-  virtual int GetDialogButtons() const OVERRIDE { return dialog_buttons_; }
+  virtual View* GetContentsView() override { return contents_.get(); }
+  virtual View* CreateExtraView() override { return extra_view_; }
+  virtual View* CreateFootnoteView() override { return footnote_view_; }
+  virtual int GetDialogButtons() const override { return dialog_buttons_; }
 
  protected:
   gfx::Rect GetUpdatedClientBounds() {
     client_view_->SizeToPreferredSize();
     client_view_->Layout();
     return client_view_->bounds();
   }
 
   // Makes sure that the content view is sized correctly. Width must be at least
   // the requested amount, but height should always match exactly.
@@ skipping 209 matching lines @@
   // Test that the FocusManager is properly cleared when the DialogClientView is
   // removed from |dialog| during the widget's destruction.
   client_view->set_owned_by_client();
   scoped_ptr<DialogClientView> owned_client_view(client_view);
   toplevel1->CloseNow();
   toplevel2->CloseNow();
   EXPECT_EQ(NULL, owned_client_view->focus_manager_);
 }
 
 }  // namespace views