| Index: chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
|
| diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
|
| index 909c854deab310949537c2e6d5dab09e9f3631fc..235542fc7b483badb2cc75a03cd70506caceb646 100644
|
| --- a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
|
| +++ b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
|
| @@ -23,12 +23,12 @@ class MockObserver {
|
| : state_(InputMethodManager::STATE_TERMINATING),
|
| update_state_count_(0) { }
|
|
|
| - void SetState(InputMethodManager::State new_state) {
|
| + void SetState(InputMethodManager::UIState new_state) {
|
| ++update_state_count_;
|
| state_ = new_state;
|
| }
|
|
|
| - base::Callback<void(InputMethodManager::State new_state)> AsCallback() {
|
| + base::Callback<void(InputMethodManager::UIState new_state)> AsCallback() {
|
| return base::Bind(&MockObserver::SetState, base::Unretained(this));
|
| }
|
|
|
| @@ -36,12 +36,10 @@ class MockObserver {
|
| return update_state_count_;
|
| }
|
|
|
| - InputMethodManager::State state() const {
|
| - return state_;
|
| - }
|
| + InputMethodManager::UIState state() const { return state_; }
|
|
|
| private:
|
| - InputMethodManager::State state_;
|
| + InputMethodManager::UIState state_;
|
| int update_state_count_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockObserver);
|
|
|