Delete IBusPropertyList.

BUG=283772

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225342 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 13 deletions

diff --git a/chromeos/ime/ibus_bridge.h b/chromeos/ime/ibus_bridge.h
index 59097f6..17be71b 100644
--- a/chromeos/ime/ibus_bridge.h
+++ b/chromeos/ime/ibus_bridge.h
@@ -11,13 +11,12 @@
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/ime/ime_constants.h"
+#include "chromeos/ime/input_method_property.h"
 
 namespace chromeos {
 
 class IBusText;
 class IBusLookupTable;
-class IBusProperty;
-typedef ScopedVector<IBusProperty> IBusPropertyList;
 
 class CHROMEOS_EXPORT IBusInputContextHandlerInterface {
  public:
@@ -156,7 +155,8 @@ class CHROMEOS_EXPORT IBusPanelPropertyHandlerInterface {
   virtual ~IBusPanelPropertyHandlerInterface() {}
 
   // Called when a new property is registered.
-  virtual void RegisterProperties(const IBusPropertyList& properties) = 0;
+  virtual void RegisterProperties(
+    const chromeos::input_method::InputMethodPropertyList& properties) = 0;
 
  protected:
   IBusPanelPropertyHandlerInterface() {}
diff --git a/chromeos/ime/mock_ime_property_handler.cc b/chromeos/ime/mock_ime_property_handler.cc
index 38fd7dc..cedec87 100644
--- a/chromeos/ime/mock_ime_property_handler.cc
+++ b/chromeos/ime/mock_ime_property_handler.cc
@@ -14,14 +14,9 @@ MockIMEPropertyHandler::~MockIMEPropertyHandler() {
 }
 
 void MockIMEPropertyHandler::RegisterProperties(
-    const IBusPropertyList& properties) {
+  const input_method::InputMethodPropertyList& properties) {
   ++register_properties_call_count_;
-  last_registered_properties_.clear();
-  last_registered_properties_.resize(properties.size());
-  for (size_t i = 0; i < properties.size(); ++i) {
-    last_registered_properties_[i] = new IBusProperty();
-    last_registered_properties_[i]->CopyFrom(*properties[i]);
-  }
+  last_registered_properties_ = properties;
 }
 
 void MockIMEPropertyHandler::Reset() {
diff --git a/chromeos/ime/mock_ime_property_handler.h b/chromeos/ime/mock_ime_property_handler.h
index f799c78..286f9f2 100644
--- a/chromeos/ime/mock_ime_property_handler.h
+++ b/chromeos/ime/mock_ime_property_handler.h
@@ -16,13 +16,14 @@ class CHROMEOS_EXPORT MockIMEPropertyHandler
   MockIMEPropertyHandler();
   virtual ~MockIMEPropertyHandler();
 
-  virtual void RegisterProperties(const IBusPropertyList& properties) OVERRIDE;
+  virtual void RegisterProperties(
+    const input_method::InputMethodPropertyList& properties) OVERRIDE;
 
   int register_properties_call_count() {
     return register_properties_call_count_;
   }
 
-  const IBusPropertyList& last_registered_properties() {
+  const input_method::InputMethodPropertyList& last_registered_properties() {
     return last_registered_properties_;
   }
 
@@ -31,7 +32,7 @@ class CHROMEOS_EXPORT MockIMEPropertyHandler
 
  private:
   int register_properties_call_count_;
-  IBusPropertyList last_registered_properties_;
+  input_method::InputMethodPropertyList last_registered_properties_;
 };
 
 }  // namespace chromeos