PPAPI: Move IMEInputEvent and TextInput to stable.

ppapi/tests/test_ime_input_event.cc

 // Copyright (c) 2012 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 "ppapi/tests/test_ime_input_event.h"
 
-#include "ppapi/c/dev/ppb_ime_input_event_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_ime_input_event.h"
 #include "ppapi/c/ppb_input_event.h"
-#include "ppapi/cpp/dev/ime_input_event_dev.h"
+#include "ppapi/cpp/ime_input_event.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
 REGISTER_TEST_CASE(ImeInputEvent);
 
 namespace {
 
 // Japanese Kanji letters meaning "a string" ('mo' 'ji' 'retsu' in Kanji)
@@ skipping 34 matching lines @@
   RUN_TEST(ImeUnawareCancel, filter);
 }
 
 bool TestImeInputEvent::Init() {
   input_event_interface_ = static_cast<const PPB_InputEvent*>(
       pp::Module::Get()->GetBrowserInterface(PPB_INPUT_EVENT_INTERFACE));
   keyboard_input_event_interface_ =
       static_cast<const PPB_KeyboardInputEvent*>(
           pp::Module::Get()->GetBrowserInterface(
               PPB_KEYBOARD_INPUT_EVENT_INTERFACE));
-  ime_input_event_interface_ = static_cast<const PPB_IMEInputEvent_Dev*>(
+  ime_input_event_interface_ = static_cast<const PPB_IMEInputEvent*>(
       pp::Module::Get()->GetBrowserInterface(
-          PPB_IME_INPUT_EVENT_DEV_INTERFACE));
+          PPB_IME_INPUT_EVENT_INTERFACE));
 
   bool success =
       input_event_interface_ &&
       keyboard_input_event_interface_ &&
       ime_input_event_interface_ &&
       CheckTestingInterface();
 
   // Set up a listener for our message that signals that all input events have
   // been received.
   // Note the following code is dependent on some features of test_case.html.
@@ skipping 50 matching lines @@
     testing_interface_->QuitMessageLoop(instance_->pp_instance());
     received_finish_message_ = true;
   }
 }
 
 void TestImeInputEvent::DidChangeView(const pp::View& view) {
   view_rect_ = view.GetRect();
 }
 
 pp::InputEvent TestImeInputEvent::CreateImeCompositionStartEvent() {
-  return pp::IMEInputEvent_Dev(
+  return pp::IMEInputEvent(
       instance_,
       PP_INPUTEVENT_TYPE_IME_COMPOSITION_START,
       100, // time_stamp
       pp::Var(""),
       std::vector<uint32_t>(),
       -1, // target_segment
       std::make_pair(0U, 0U) // selection
   );
 }
 
 pp::InputEvent TestImeInputEvent::CreateImeCompositionUpdateEvent(
     const std::string& text,
     const std::vector<uint32_t>& segments,
     int32_t target_segment,
     const std::pair<uint32_t, uint32_t>& selection) {
-  return pp::IMEInputEvent_Dev(
+  return pp::IMEInputEvent(
       instance_,
       PP_INPUTEVENT_TYPE_IME_COMPOSITION_UPDATE,
       100, // time_stamp
       text,
       segments,
       target_segment,
       selection
   );
 }
 
 pp::InputEvent TestImeInputEvent::CreateImeCompositionEndEvent(
     const std::string& text) {
-  return pp::IMEInputEvent_Dev(
+  return pp::IMEInputEvent(
       instance_,
       PP_INPUTEVENT_TYPE_IME_COMPOSITION_END,
       100, // time_stamp
       pp::Var(text),
       std::vector<uint32_t>(),
       -1, // target_segment
       std::make_pair(0U, 0U) // selection
   );
 }
 
 pp::InputEvent TestImeInputEvent::CreateImeTextEvent(const std::string& text) {
-  return pp::IMEInputEvent_Dev(
+  return pp::IMEInputEvent(
       instance_,
       PP_INPUTEVENT_TYPE_IME_TEXT,
       100, // time_stamp
       pp::Var(text),
       std::vector<uint32_t>(),
       -1, // target_segment
       std::make_pair(0U, 0U) // selection
   );
 }
 
@@ skipping 62 matching lines @@
       // For COMPOSITION_END and TEXT, GetText() has meaning.
       return pp::Var(pp::PASS_REF,
                      ime_input_event_interface_->GetText(received)) ==
              pp::Var(pp::PASS_REF,
                      ime_input_event_interface_->GetText(expected));
 
     case PP_INPUTEVENT_TYPE_IME_COMPOSITION_UPDATE:
       // For COMPOSITION_UPDATE, all fields must be checked.
       {
         uint32_t received_segment_number =
-            ime_input_event_interface_->GetSegmentNumber(received);
+            ime_input_event_interface_->GetSegmentCount(received);
         uint32_t expected_segment_number =
-            ime_input_event_interface_->GetSegmentNumber(expected);
+            ime_input_event_interface_->GetSegmentCount(expected);
         if (received_segment_number != expected_segment_number)
           return false;
 
         // The "<=" is not a bug. i-th segment is represented as the pair of
         // i-th and (i+1)-th offsets in Pepper IME API.
         for (uint32_t i = 0; i <= received_segment_number; ++i) {
           if (ime_input_event_interface_->GetSegmentOffset(received, i) !=
               ime_input_event_interface_->GetSegmentOffset(expected, i))
             return false;
         }
@@ skipping 140 matching lines @@
   expected_events_.clear();
 
   // Test for IME-unaware plugins. Cancel won't issue any events.
   ASSERT_TRUE(SimulateInputEvent(update_event));
   ASSERT_TRUE(SimulateInputEvent(CreateImeCompositionEndEvent(std::string())));
 
   ASSERT_TRUE(expected_events_.empty());
   PASS();
 }