Avoid basename conflict in text_composition

Rename ui/base/ime/chromeos/text_composition to
ui/base/ime/chromeos/text_composition_chromeos, to avoid
conflict in basename with ui/base/ime/text_composition.
See http://code.google.com/p/gyp/issues/detail?id=384.

Also, ui/base/ime/chromeos/composition_text_unittest.cc
was not listed in any build file, so include the "_chromeos"
in its name too, to match, and then add it to gyp/gn files.
(I may regret that.)

BUG=490824, gyp:384, 472772

Review URL: https://codereview.chromium.org/1149223004

Cr-Commit-Position: refs/heads/master@{#331264}

13 files changed, 20 insertions, 19 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc
index e5475ca..0c53579 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -22,7 +22,7 @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/candidate_window.h"
 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 #include "ui/base/ime/chromeos/ime_keymap.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
index e63a742..b21d737 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc
@@ -12,7 +12,7 @@
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
 #include "ui/base/ime/chromeos/input_method_descriptor.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 3532286..9aab100 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -680,6 +680,7 @@ test("ui_base_unittests") {
     sources += [
       "ime/candidate_window_unittest.cc",
       "ime/chromeos/character_composer_unittest.cc",
+      "ime/chromeos/composition_text_chromeos_unittest.cc",
       "ime/input_method_base_unittest.cc",
       "ime/input_method_chromeos_unittest.cc",
       "ime/remote_input_method_win_unittest.cc",
diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
index e697402..99e4aae 100644
--- a/ui/base/ime/BUILD.gn
+++ b/ui/base/ime/BUILD.gn
@@ -14,8 +14,8 @@ component("ime") {
     "chromeos/character_composer.h",
     "chromeos/component_extension_ime_manager.cc",
     "chromeos/component_extension_ime_manager.h",
-    "chromeos/composition_text.cc",
-    "chromeos/composition_text.h",
+    "chromeos/composition_text_chromeos.cc",
+    "chromeos/composition_text_chromeos.h",
     "chromeos/extension_ime_util.cc",
     "chromeos/extension_ime_util.h",
     "chromeos/fake_ime_keyboard.cc",
@@ -166,10 +166,9 @@ component("ime") {
   }
 
   if (is_win) {
-    cflags = [
-      "/wd4324",  # Structure was padded due to __declspec(align()), which is
-                  # uninteresting.
-    ]
+    cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()), which is
+                            # uninteresting.
+
     libs = [ "imm32.lib" ]
   }
 
diff --git a/ui/base/ime/chromeos/composition_text.cc b/ui/base/ime/chromeos/composition_text_chromeos.cc
index 4451f03..905d8ea 100644
--- a/ui/base/ime/chromeos/composition_text.cc
+++ b/ui/base/ime/chromeos/composition_text_chromeos.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 
 namespace chromeos {
 
diff --git a/ui/base/ime/chromeos/composition_text.h b/ui/base/ime/chromeos/composition_text_chromeos.h
index 90b8a8c..3350b0e 100644
--- a/ui/base/ime/chromeos/composition_text.h
+++ b/ui/base/ime/chromeos/composition_text_chromeos.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_
-#define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_
+#ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
+#define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
 
 #include <string>
 #include <vector>
@@ -67,4 +67,4 @@ class UI_BASE_IME_EXPORT CompositionText {
 
 }  // namespace chromeos
 
-#endif  // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_
+#endif  // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_
diff --git a/ui/base/ime/chromeos/composition_text_unittest.cc b/ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
index 595d44b..067681e 100644
--- a/ui/base/ime/chromeos/composition_text_unittest.cc
+++ b/ui/base/ime/chromeos/composition_text_chromeos_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 // TODO(nona): Add more tests.
 
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.cc b/ui/base/ime/chromeos/mock_ime_input_context_handler.cc
index 0787811..936caf2 100644
--- a/ui/base/ime/chromeos/mock_ime_input_context_handler.cc
+++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.cc
@@ -4,7 +4,7 @@
 
 #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h"
 
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 
 namespace chromeos {
 
diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.h b/ui/base/ime/chromeos/mock_ime_input_context_handler.h
index 5eefe6e..690f7a0 100644
--- a/ui/base/ime/chromeos/mock_ime_input_context_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_input_context_handler.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
 #define UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
 
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
 #include "ui/base/ime/ui_base_ime_export.h"
 
diff --git a/ui/base/ime/input_method_chromeos.cc b/ui/base/ime/input_method_chromeos.cc
index 1a4b7e6..e6491e3 100644
--- a/ui/base/ime/input_method_chromeos.cc
+++ b/ui/base/ime/input_method_chromeos.cc
@@ -17,7 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/third_party/icu/icu_utf.h"
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/ime/text_input_client.h"
diff --git a/ui/base/ime/input_method_chromeos_unittest.cc b/ui/base/ime/input_method_chromeos_unittest.cc
index 50cbd8e..aa4ac76 100644
--- a/ui/base/ime/input_method_chromeos_unittest.cc
+++ b/ui/base/ime/input_method_chromeos_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/ime/chromeos/composition_text.h"
+#include "ui/base/ime/chromeos/composition_text_chromeos.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
 #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h"
 #include "ui/base/ime/chromeos/mock_ime_engine_handler.h"
diff --git a/ui/base/ime/ui_base_ime.gyp b/ui/base/ime/ui_base_ime.gyp
index e58be98..65134f7 100644
--- a/ui/base/ime/ui_base_ime.gyp
+++ b/ui/base/ime/ui_base_ime.gyp
@@ -35,8 +35,8 @@
         'chromeos/character_composer.h',
         'chromeos/component_extension_ime_manager.cc',
         'chromeos/component_extension_ime_manager.h',
-        'chromeos/composition_text.cc',
-        'chromeos/composition_text.h',
+        'chromeos/composition_text_chromeos.cc',
+        'chromeos/composition_text_chromeos.h',
         'chromeos/extension_ime_util.cc',
         'chromeos/extension_ime_util.h',
         'chromeos/fake_ime_keyboard.cc',
diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp
index 39d6d94..69d904a 100644
--- a/ui/base/ui_base_tests.gyp
+++ b/ui/base/ui_base_tests.gyp
@@ -70,6 +70,7 @@
         'dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
         'ime/candidate_window_unittest.cc',
         'ime/chromeos/character_composer_unittest.cc',
+        'ime/chromeos/composition_text_chromeos_unittest.cc',
         'ime/composition_text_util_pango_unittest.cc',
         'ime/input_method_base_unittest.cc',
         'ime/input_method_chromeos_unittest.cc',