Remove dead code unnecessarily added by r231563 and 236449

ui/base/ime/input_method_tsf.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/input_method_tsf.h"
 
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/ime/win/tsf_event_router.h"
 
@@ skipping 80 matching lines @@
       original_result = OnDeadChar(
           event.message, event.wParam, event.lParam, &handled);
       break;
   }
   if (result)
     *result = original_result;
   return !!handled;
 }
 
 void InputMethodTSF::OnTextInputTypeChanged(const TextInputClient* client) {
-  if (IsTextInputClientFocused(client) && IsWindowFocused(client)) {
-    ui::TSFBridge::GetInstance()->CancelComposition();
-    ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
-  }
-  InputMethodWin::OnTextInputTypeChanged(client);
+  if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
+    return;
+  ui::TSFBridge::GetInstance()->CancelComposition();
+  ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(client);
 }
 
 void InputMethodTSF::OnCaretBoundsChanged(const TextInputClient* client) {
-  if (IsTextInputClientFocused(client) && IsWindowFocused(client))
-    ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
-  InputMethodWin::OnCaretBoundsChanged(client);
+  if (!IsTextInputClientFocused(client) || !IsWindowFocused(client))
+    return;
+  ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
 }
 
 void InputMethodTSF::CancelComposition(const TextInputClient* client) {
   if (IsTextInputClientFocused(client) && IsWindowFocused(client))
     ui::TSFBridge::GetInstance()->CancelComposition();
 }
 
 void InputMethodTSF::DetachTextInputClient(TextInputClient* client) {
   InputMethodWin::DetachTextInputClient(client);
   ui::TSFBridge::GetInstance()->RemoveFocusedClient(client);
@@ skipping 28 matching lines @@
   }
   InputMethodWin::OnDidChangeFocusedClient(focused_before, focused);
 }
 
 void InputMethodTSF::ConfirmCompositionText() {
   if (!IsTextInputTypeNone())
     ui::TSFBridge::GetInstance()->ConfirmComposition();
 }
 
 }  // namespace ui