| Index: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
|
| index d58c83879bcad70c2be21dd50f0b502e0ea01d79..498a0c1ab1d3b4b6bf1b808c8e76566af869fbdd 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
|
| @@ -71,12 +71,12 @@ class TestObserver : public InputMethodManager::Observer,
|
| virtual ~TestObserver() {}
|
|
|
| virtual void InputMethodChanged(InputMethodManager* manager,
|
| - bool show_message) OVERRIDE {
|
| + bool show_message) override {
|
| ++input_method_changed_count_;
|
| last_show_message_ = show_message;
|
| }
|
| virtual void InputMethodMenuItemChanged(
|
| - ash::ime::InputMethodMenuManager* manager) OVERRIDE {
|
| + ash::ime::InputMethodMenuManager* manager) override {
|
| ++input_method_menu_item_changed_count_;
|
| }
|
|
|
| @@ -98,10 +98,10 @@ class TestCandidateWindowObserver
|
|
|
| virtual ~TestCandidateWindowObserver() {}
|
|
|
| - virtual void CandidateWindowOpened(InputMethodManager* manager) OVERRIDE {
|
| + virtual void CandidateWindowOpened(InputMethodManager* manager) override {
|
| ++candidate_window_opened_count_;
|
| }
|
| - virtual void CandidateWindowClosed(InputMethodManager* manager) OVERRIDE {
|
| + virtual void CandidateWindowClosed(InputMethodManager* manager) override {
|
| ++candidate_window_closed_count_;
|
| }
|
|
|
| @@ -122,7 +122,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest {
|
| }
|
| virtual ~InputMethodManagerImplTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| profile_manager_.reset(new TestingProfileManager(GetBrowserProcess()));
|
| ASSERT_TRUE(profile_manager_->SetUp());
|
|
|
| @@ -148,7 +148,7 @@ class InputMethodManagerImplTest : public BrowserWithTestWindowTest {
|
| BrowserWithTestWindowTest::SetUp();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| BrowserWithTestWindowTest::TearDown();
|
|
|
| ui::ShutdownInputMethodForTesting();
|
|
|