| Index: ash/test/test_shell_delegate.h
|
| diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
|
| index 9b273fc9a48134bae5f9f2e6d7420b1e8ee5fdba..06ac471924492ea94db030dd4a6ad82349db5f88 100644
|
| --- a/ash/test/test_shell_delegate.h
|
| +++ b/ash/test/test_shell_delegate.h
|
| @@ -76,7 +76,8 @@ class TestShellDelegate : public ShellDelegate {
|
| scoped_ptr<content::BrowserContext> active_browser_context_;
|
| scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
|
|
|
| - ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
|
| + base::ObserverList<ash::VirtualKeyboardStateObserver>
|
| + keyboard_state_observer_list_;
|
|
|
| TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
|
|
|
|
|