Remove layout field from IBusEngineDescription

It turned out that IBusEngineDescription is no longer used.
The layout information is in InputMethodDescriptor and only it is used.
Thus removing it.

BUG=164375
TEST=None

Review URL: https://chromiumcodereview.appspot.com/13880027

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

3 files changed, 7 insertions, 17 deletions

diff --git a/chromeos/dbus/ibus/ibus_component.cc b/chromeos/dbus/ibus/ibus_component.cc
index 88642f7..ea8854c 100644
--- a/chromeos/dbus/ibus/ibus_component.cc
+++ b/chromeos/dbus/ibus/ibus_component.cc
@@ -53,7 +53,7 @@ bool PopIBusEngineDesc(dbus::MessageReader* reader,
                << "The 7th argument should be string.";
     return false;
   }
-  if (!ibus_object_reader.PopString(&engine_desc->layout)) {
+  if (!ibus_object_reader.PopString(&unused_string_field)) {
     LOG(ERROR) << "Invalid variant structure[IBusEngineDesc]: "
                << "The 8th argument should be string.";
     return false;
@@ -95,7 +95,7 @@ void AppendIBusEngineDesc(const IBusComponent::EngineDescription& engine_desc,
   ibus_object_writer.AppendString("");  // The license field is not used.
   ibus_object_writer.AppendString(engine_desc.author);
   ibus_object_writer.AppendString("");  // The icon path field is not used.
-  ibus_object_writer.AppendString(engine_desc.layout);
+  ibus_object_writer.AppendString("");  // The layout field is not used.
   ibus_object_writer.AppendUint32(0);  // The engine rank is not used.
   ibus_object_writer.AppendString("");  // The hotkey field is not used.
   ibus_object_writer.AppendString("");  // The symbol field is not used.
@@ -233,14 +233,12 @@ IBusComponent::EngineDescription::EngineDescription(
     const std::string& display_name,
     const std::string& description,
     const std::string& language_code,
-    const std::string& author,
-    const std::string& layout)
+    const std::string& author)
     : engine_id(engine_id),
       display_name(display_name),
       description(description),
       language_code(language_code),
-      author(author),
-      layout(layout) {
+      author(author) {
 }
 
 IBusComponent::EngineDescription::~EngineDescription() {
diff --git a/chromeos/dbus/ibus/ibus_component.h b/chromeos/dbus/ibus/ibus_component.h
index 065e94e..776929b 100644
--- a/chromeos/dbus/ibus/ibus_component.h
+++ b/chromeos/dbus/ibus/ibus_component.h
@@ -97,15 +97,13 @@ class CHROMEOS_EXPORT IBusComponent {
                       const std::string& display_name,
                       const std::string& description,
                       const std::string& language_code,
-                      const std::string& author,
-                      const std::string& layout);
+                      const std::string& author);
     ~EngineDescription();
     std::string engine_id;  // The engine id.
     std::string display_name;  // The display name.
     std::string description;  // The engine description.
     std::string language_code;  // The engine's language(ex. "en").
     std::string author;  // The author of engine.
-    std::string layout;  // The keyboard layout of engine.
   };
 
   IBusComponent();
diff --git a/chromeos/dbus/ibus/ibus_component_unittest.cc b/chromeos/dbus/ibus/ibus_component_unittest.cc
index 2bed5517..4b6f2fa 100644
--- a/chromeos/dbus/ibus/ibus_component_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_component_unittest.cc
@@ -21,26 +21,22 @@ TEST(IBusComponentTest, WriteReadIBusComponentTest) {
   const std::string kEngineDescription1 = "Engine Description 1";
   const std::string kEngineLanguageCode1 = "en";
   const std::string kEngineAuthor1 = "Engine Author 1";
-  const std::string kEngineLayout1 = "us::eng";
   const IBusComponent::EngineDescription engine_desc1(kEngineId1,
                                                       kEngineDisplayName1,
                                                       kEngineDescription1,
                                                       kEngineLanguageCode1,
-                                                      kEngineAuthor1,
-                                                      kEngineLayout1);
+                                                      kEngineAuthor1);
 
   const std::string kEngineId2 = "Engine Id 2";
   const std::string kEngineDisplayName2 = "Engine Display Name 2";
   const std::string kEngineDescription2 = "Engine Description 2";
   const std::string kEngineLanguageCode2 = "ja";
   const std::string kEngineAuthor2 = "Engine Author 2";
-  const std::string kEngineLayout2 = "ja::jp";
   const IBusComponent::EngineDescription engine_desc2(kEngineId2,
                                                       kEngineDisplayName2,
                                                       kEngineDescription2,
                                                       kEngineLanguageCode2,
-                                                      kEngineAuthor2,
-                                                      kEngineLayout2);
+                                                      kEngineAuthor2);
 
   // Create a IBusComponent.
   IBusComponent ibus_component;
@@ -72,14 +68,12 @@ TEST(IBusComponentTest, WriteReadIBusComponentTest) {
   EXPECT_EQ(kEngineDescription1, engine_descriptions[0].description);
   EXPECT_EQ(kEngineLanguageCode1, engine_descriptions[0].language_code);
   EXPECT_EQ(kEngineAuthor1, engine_descriptions[0].author);
-  EXPECT_EQ(kEngineLayout1, engine_descriptions[0].layout);
 
   EXPECT_EQ(kEngineId2, engine_descriptions[1].engine_id);
   EXPECT_EQ(kEngineDisplayName2, engine_descriptions[1].display_name);
   EXPECT_EQ(kEngineDescription2, engine_descriptions[1].description);
   EXPECT_EQ(kEngineLanguageCode2, engine_descriptions[1].language_code);
   EXPECT_EQ(kEngineAuthor2, engine_descriptions[1].author);
-  EXPECT_EQ(kEngineLayout2, engine_descriptions[1].layout);
 }
 
 }  // namespace chromeos