| Index: ui/base/ime/input_method_initializer.cc
|
| diff --git a/ui/base/ime/input_method_initializer.cc b/ui/base/ime/input_method_initializer.cc
|
| index 1ac3c27aa46fc5af7103d3015315a4b5c6959cc6..c368c5f87f2149bf40901a96cecf81d350128128 100644
|
| --- a/ui/base/ime/input_method_initializer.cc
|
| +++ b/ui/base/ime/input_method_initializer.cc
|
| @@ -43,9 +43,8 @@ void InitializeInputMethodForTesting() {
|
| g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
|
| const LinuxInputMethodContextFactory* factory =
|
| LinuxInputMethodContextFactory::instance();
|
| - CHECK(!factory || factory == g_linux_input_method_context_factory)
|
| - << "LinuxInputMethodContextFactory was already initialized somewhere "
|
| - << "else.";
|
| + // LinuxInputMethodContextFactory was already initialized somewhere else.
|
| + CHECK(!factory || factory == g_linux_input_method_context_factory);
|
| LinuxInputMethodContextFactory::SetInstance(
|
| g_linux_input_method_context_factory);
|
| #endif
|
| @@ -57,8 +56,8 @@ void ShutdownInputMethodForTesting() {
|
| #elif defined(USE_AURA) && defined(OS_LINUX)
|
| const LinuxInputMethodContextFactory* factory =
|
| LinuxInputMethodContextFactory::instance();
|
| - CHECK(!factory || factory == g_linux_input_method_context_factory)
|
| - << "An unknown LinuxInputMethodContextFactory was set.";
|
| + // An unknown LinuxInputMethodContextFactory was set.
|
| + CHECK(!factory || factory == g_linux_input_method_context_factory);
|
| LinuxInputMethodContextFactory::SetInstance(NULL);
|
| delete g_linux_input_method_context_factory;
|
| g_linux_input_method_context_factory = NULL;
|
|
|