Update Mus IME mojom and struct traits with new style enums and tests.

services/ui/public/interfaces/ime/ime_struct_traits_unittest.cc

 // Copyright 2016 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 "services/ui/public/interfaces/ime/ime_struct_traits.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/ui/public/interfaces/ime/ime_struct_traits_test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/composition_underline.h"
+#include "ui/gfx/range/mojo/range_struct_traits.h"
 
 namespace ui {
 
 namespace {
 
 class IMEStructTraitsTest : public testing::Test,
                             public mojom::IMEStructTraitsTest {
  public:
   IMEStructTraitsTest() {}
 
  protected:
   mojom::IMEStructTraitsTestPtr GetTraitsTestProxy() {
     return traits_test_bindings_.CreateInterfacePtrAndBind(this);
   }
 
  private:
   // mojom::IMEStructTraitsTest:
-  void EchoCompositionText(
-      const CompositionText& in,
-      const EchoCompositionTextCallback& callback) override {
-    callback.Run(in);
-  }
   void EchoTextInputMode(TextInputMode in,
                          const EchoTextInputModeCallback& callback) override {
     callback.Run(in);
   }
   void EchoTextInputType(TextInputType in,
                          const EchoTextInputTypeCallback& callback) override {
     callback.Run(in);
   }
 
   base::MessageLoop loop_;  // A MessageLoop is needed for Mojo IPC to work.
@@ skipping 62 matching lines @@
 }
 
 TEST_F(IMEStructTraitsTest, CompositionText) {
   CompositionText input;
   input.text = base::UTF8ToUTF16("abcdefghij");
   input.underlines.push_back(CompositionUnderline(0, 2, SK_ColorGRAY, false));
   input.underlines.push_back(
       CompositionUnderline(3, 6, SK_ColorRED, true, SK_ColorGREEN));
   input.selection = gfx::Range(1, 7);
 
-  mojom::IMEStructTraitsTestPtr proxy = GetTraitsTestProxy();
   CompositionText output;
-  proxy->EchoCompositionText(input, &output);
+  EXPECT_TRUE(mojom::CompositionText::Deserialize(
+      mojom::CompositionText::Serialize(&input), &output));
 
   EXPECT_EQ(input, output);
 }
 
 TEST_F(IMEStructTraitsTest, TextInputMode) {
   const TextInputMode kTextInputModes[] = {
       TEXT_INPUT_MODE_DEFAULT,     TEXT_INPUT_MODE_VERBATIM,
       TEXT_INPUT_MODE_LATIN,       TEXT_INPUT_MODE_LATIN_NAME,
       TEXT_INPUT_MODE_LATIN_PROSE, TEXT_INPUT_MODE_FULL_WIDTH_LATIN,
       TEXT_INPUT_MODE_KANA,        TEXT_INPUT_MODE_KANA_NAME,
@@ skipping 33 matching lines @@
 
   mojom::IMEStructTraitsTestPtr proxy = GetTraitsTestProxy();
   for (size_t i = 0; i < arraysize(kTextInputTypes); i++) {
     ui::TextInputType type_out;
     ASSERT_TRUE(proxy->EchoTextInputType(kTextInputTypes[i], &type_out));
     EXPECT_EQ(kTextInputTypes[i], type_out);
   }
 }
 
 }  // namespace ui