Revert of Split ui/base/ime into a new component

ui/base/ime/win/tsf_input_scope.h

Index: ui/base/ime/win/tsf_input_scope.h
diff --git a/ui/base/ime/win/tsf_input_scope.h b/ui/base/ime/win/tsf_input_scope.h
index 6d95405589ec572794f1432bd4bd99016e8c3073..536d395dce1482449a65604ed693713a00bb5e7d 100644
--- a/ui/base/ime/win/tsf_input_scope.h
+++ b/ui/base/ime/win/tsf_input_scope.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/ime/ui_base_ime_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 namespace tsf_inputscope {
@@ -20,7 +20,7 @@
 // Returns InputScope list corresoponding to ui::TextInputType and
 // ui::TextInputMode.
 // This function is only used from following functions but declared for test.
-UI_BASE_IME_EXPORT std::vector<InputScope> GetInputScopes(
+UI_BASE_EXPORT std::vector<InputScope> GetInputScopes(
     TextInputType text_input_type,
     TextInputMode text_input_mode);
 
@@ -30,15 +30,14 @@
 // in the target field.
 // The returned instance has 0 reference count. The caller must maintain its
 // reference count.
-UI_BASE_IME_EXPORT ITfInputScope* CreateInputScope(
-    TextInputType text_input_type,
-    TextInputMode text_input_mode);
+UI_BASE_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type,
+                                               TextInputMode text_input_mode);
 
 // A wrapper of the SetInputScopes API exported by msctf.dll.
 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms629026.aspx
 // Does nothing on Windows XP in case TSF is disabled.
 // NOTE: For TSF-aware window, you should use ITfInputScope instead.
-UI_BASE_IME_EXPORT void SetInputScopeForTsfUnawareWindow(
+UI_BASE_EXPORT void SetInputScopeForTsfUnawareWindow(
     HWND window_handle,
     TextInputType text_input_type,
     TextInputMode text_input_mode);