1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/ui/base/ime/chromeos/character_composer.h b/chromium/ui/base/ime/chromeos/character_composer.h
index 0624eb55c68..5d4267f384f 100644
--- a/chromium/ui/base/ime/chromeos/character_composer.h
+++ b/chromium/ui/base/ime/chromeos/character_composer.h
@@ -8,14 +8,14 @@
 #include <vector>
 
 #include "base/strings/string_util.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class KeyEvent;
 
 // A class to recognize compose and dead key sequence.
 // Outputs composed character.
-class UI_EXPORT CharacterComposer {
+class UI_BASE_EXPORT CharacterComposer {
  public:
   CharacterComposer();
   ~CharacterComposer();
@@ -30,10 +30,12 @@ class UI_EXPORT CharacterComposer {
 
   // Returns a string consisting of composed character.
   // Empty string is returned when there is no composition result.
-  const string16& composed_character() const { return composed_character_; }
+  const base::string16& composed_character() const {
+    return composed_character_;
+  }
 
   // Returns the preedit string.
-  const string16& preedit_string() const { return preedit_string_; }
+  const base::string16& preedit_string() const { return preedit_string_; }
 
  private:
   friend class CharacterComposerTest;
@@ -85,10 +87,10 @@ class UI_EXPORT CharacterComposer {
   std::vector<unsigned int> compose_buffer_;
 
   // A string representing the composed character.
-  string16 composed_character_;
+  base::string16 composed_character_;
 
   // Preedit string.
-  string16 preedit_string_;
+  base::string16 preedit_string_;
 
   // Composition mode which this instance is in.
   CompositionMode composition_mode_;