Refactoring the ownership of ui::InputMethod.

ui/base/ime/input_method_chromeos.cc

Index: ui/base/ime/input_method_chromeos.cc
diff --git a/ui/base/ime/input_method_chromeos.cc b/ui/base/ime/input_method_chromeos.cc
index e6491e3cc139f869a1944cdafca60ed6ac415d3b..b5d1f3a741789083f632b2d3cf08936765e5b850 100644
--- a/ui/base/ime/input_method_chromeos.cc
+++ b/ui/base/ime/input_method_chromeos.cc
@@ -50,7 +50,8 @@ InputMethodChromeOS::~InputMethodChromeOS() {
   // We are dead, so we need to ask the client to stop relying on us.
   OnInputMethodChanged();
 
-  chromeos::IMEBridge::Get()->SetInputContextHandler(NULL);
+  if (chromeos::IMEBridge::Get())
+    chromeos::IMEBridge::Get()->SetInputContextHandler(NULL);
 }
 
 void InputMethodChromeOS::OnFocus() {
@@ -92,7 +93,7 @@ void InputMethodChromeOS::ProcessKeyEventDone(const ui::KeyEvent* event,
 }
 
 bool InputMethodChromeOS::DispatchKeyEvent(const ui::KeyEvent& event) {
-  DCHECK(event.type() == ET_KEY_PRESSED || event.type() == ET_KEY_RELEASED);
+  DCHECK(event.IsKeyEvent());
   DCHECK(system_toplevel_window_focused());
 
   // For linux_chromeos, the ime keyboard cannot track the caps lock state by