Fix comment/string typo in chromeos/dbus/ibus.

BUG=none

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

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

23 files changed, 39 insertions, 42 deletions

diff --git a/chromeos/dbus/ibus/ibus_client.h b/chromeos/dbus/ibus/ibus_client.h
index 78502d5..fb671ad 100644
--- a/chromeos/dbus/ibus/ibus_client.h
+++ b/chromeos/dbus/ibus/ibus_client.h
@@ -64,7 +64,7 @@ class CHROMEOS_EXPORT IBusClient {
   // Requests the ibus-daemon to exit daemon process. If |option| is
   // RESTART_IBUS_DAEMON, ibus-daemon will be relaunched. If |option| is
   // SHUT_DOWN_IBUS_DAEMON, ibus-daemon will not be relaunched. The
-  // |error_callback| is called if an error occures.
+  // |error_callback| is called if an error occurs.
   virtual void Exit(ExitOption option, const ErrorCallback& error_callback) = 0;
 
   // Factory function, creates a new instance and returns ownership.
diff --git a/chromeos/dbus/ibus/ibus_client_unittest.cc b/chromeos/dbus/ibus/ibus_client_unittest.cc
index b8a01e6..a76330a 100644
--- a/chromeos/dbus/ibus/ibus_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_client_unittest.cc
@@ -297,7 +297,7 @@ TEST_F(IBusClientTest, SetGlobalEngineTest_InvalidResponse) {
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
-  // Set invlaid response.
+  // Set invalid response.
   response_ = NULL;
 
   // The error response is not used in SetGLobalEngine.
@@ -368,7 +368,7 @@ TEST_F(IBusClientTest, ExitTest_InvalidResponse) {
   MockErrorCallback error_callback;
   EXPECT_CALL(error_callback, Run());
 
-  // Set invlaid response.
+  // Set invalid response.
   response_ = NULL;
 
   // The error response is not used in SetGLobalEngine.
diff --git a/chromeos/dbus/ibus/ibus_component.cc b/chromeos/dbus/ibus/ibus_component.cc
index a7bedd6..f93c978 100644
--- a/chromeos/dbus/ibus/ibus_component.cc
+++ b/chromeos/dbus/ibus/ibus_component.cc
@@ -101,7 +101,7 @@ void AppendIBusEngineDesc(const IBusComponent::EngineDescription& engine_desc,
   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.
-  ibus_object_writer.AppendString("");  // The command line field is nto used.
+  ibus_object_writer.AppendString("");  // The command line field is not used.
   ibus_object_writer.CloseAll();
 }
 
diff --git a/chromeos/dbus/ibus/ibus_component.h b/chromeos/dbus/ibus/ibus_component.h
index 4bbd1cc4..ec1dc0c 100644
--- a/chromeos/dbus/ibus/ibus_component.h
+++ b/chromeos/dbus/ibus/ibus_component.h
@@ -40,7 +40,7 @@ namespace ibus {
 //     uint32 0  // The engine rank. (not in use).
 //     string ""  // The hotkey to switch IME.(not in use)
 //     string ""  // The symbol character of this engine (not in use).
-//     string ""  // The command line to execute this engine (not inuse).
+//     string ""  // The command line to execute this engine (not in use).
 // }
 //
 // IBusComponent: (signature is "ssssssssavav")
@@ -78,7 +78,7 @@ namespace ibus {
 class IBusComponent;
 
 // Pops a IBusComponent from |reader|.
-// Returns false if an error occures.
+// Returns false if an error occurs.
 bool CHROMEOS_EXPORT PopIBusComponent(dbus::MessageReader* reader,
                                       IBusComponent* ibus_component);
 
diff --git a/chromeos/dbus/ibus/ibus_component_unittest.cc b/chromeos/dbus/ibus/ibus_component_unittest.cc
index cc77e94..5733a2b 100644
--- a/chromeos/dbus/ibus/ibus_component_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_component_unittest.cc
@@ -14,7 +14,7 @@ namespace ibus {
 
 TEST(IBusComponentTest, WriteReadIBusComponentTest) {
   const std::string kName = "Component Name";
-  const std::string kDescription = "Component Descriptoin";
+  const std::string kDescription = "Component Description";
   const std::string kAuthor = "Component Author";
 
   const std::string kEngineId1 = "Engine Id 1";
diff --git a/chromeos/dbus/ibus/ibus_config_client_unittest.cc b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
index 840690b..2b8e5c7 100644
--- a/chromeos/dbus/ibus/ibus_config_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_config_client_unittest.cc
@@ -49,7 +49,7 @@ class SetValueVerifierBase {
         expected_key_(expected_key),
         behavior_(behavior) {}
 
-  // Handles SetValue method call. This function checkes "section" and "key"
+  // Handles SetValue method call. This function checks "section" and "key"
   // field. For the "value" field, subclass checks it with over riding
   // VeirfyVariant member function.
   void Run(dbus::MethodCall* method_call,
diff --git a/chromeos/dbus/ibus/ibus_engine_factory_service.h b/chromeos/dbus/ibus/ibus_engine_factory_service.h
index ccafde0..7f1e366 100644
--- a/chromeos/dbus/ibus/ibus_engine_factory_service.h
+++ b/chromeos/dbus/ibus/ibus_engine_factory_service.h
@@ -41,7 +41,7 @@ class CHROMEOS_EXPORT IBusEngineFactoryService {
   virtual void UnsetCreateEngineHandler(const std::string& engine_id) = 0;
 
   // Factory function, creates a new instance and returns ownership.
-  // For normal usage, accesses the sigleton via DBusThreadManager::Get().
+  // For normal usage, accesses the singleton via DBusThreadManager::Get().
   static CHROMEOS_EXPORT IBusEngineFactoryService* Create(
       dbus::Bus* bus,
       DBusClientImplementationType type);
diff --git a/chromeos/dbus/ibus/ibus_engine_service.h b/chromeos/dbus/ibus/ibus_engine_service.h
index f76a20d..e7071b9 100644
--- a/chromeos/dbus/ibus/ibus_engine_service.h
+++ b/chromeos/dbus/ibus/ibus_engine_service.h
@@ -127,7 +127,7 @@ class CHROMEOS_EXPORT IBusEngineService {
   // This class doesn't take the ownership of |handler|.
   virtual void SetEngine(IBusEngineHandlerInterface* handler) = 0;
 
-  // Unsets the current IBus engine hanlder.
+  // Unsets the current IBus engine handler.
   virtual void UnsetEngine() = 0;
 
   // Emits RegisterProperties signal.
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index a88bc83..cecb59e 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -65,7 +65,7 @@ class EmptyResponseExpectation {
   explicit EmptyResponseExpectation(const uint32 serial_no)
       : serial_no_(serial_no) {}
 
-  // Evaluates the given |resposne| has no argument.
+  // Evaluates the given |response| has no argument.
   void Evaluate(dbus::Response* response) {
     scoped_ptr<dbus::Response> response_deleter(response);
     EXPECT_EQ(serial_no_, response->GetReplySerial());
@@ -86,7 +86,7 @@ class BoolResponseExpectation {
       : serial_no_(serial_no),
         result_(result) {}
 
-  // Evaluates the given |resposne| has only one boolean and which is equals to
+  // Evaluates the given |response| has only one boolean and which is equals to
   // |result_| which is given in ctor.
   void Evaluate(dbus::Response* response) {
     scoped_ptr<dbus::Response> response_deleter(response);
@@ -466,7 +466,7 @@ class IBusEngineServiceTest : public testing::Test {
         .WillRepeatedly(
             Invoke(this, &IBusEngineServiceTest::OnMethodExported));
 
-    // Surpress uninteresting mock function call warning.
+    // Suppress uninteresting mock function call warning.
     EXPECT_CALL(*mock_bus_.get(),
                 AssertOnOriginThread())
         .WillRepeatedly(Return());
@@ -1008,7 +1008,7 @@ TEST_F(IBusEngineServiceTest, SetSurroundingTextTest) {
 }
 
 TEST_F(IBusEngineServiceTest, RegisterProperties) {
-  // Set expetations.
+  // Set expectations.
   ibus::IBusPropertyList property_list;
   property_list.push_back(new ibus::IBusProperty());
   property_list[0]->set_key("Sample Key");
@@ -1027,7 +1027,7 @@ TEST_F(IBusEngineServiceTest, RegisterProperties) {
 }
 
 TEST_F(IBusEngineServiceTest, UpdatePreeditTest) {
-  // Set expetations.
+  // Set expectations.
   ibus::IBusText ibus_text;
   ibus_text.set_text("Sample Text");
   const uint32 kCursorPos = 9;
diff --git a/chromeos/dbus/ibus/ibus_input_context_client.h b/chromeos/dbus/ibus/ibus_input_context_client.h
index 3bcaac1..8c10a8e 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client.h
+++ b/chromeos/dbus/ibus/ibus_input_context_client.h
@@ -99,7 +99,7 @@ class CHROMEOS_EXPORT IBusInputContextClient {
   // Invokes SetCursorLocation method call.
   virtual void SetCursorLocation(int32 x, int32 y, int32 width,
                                  int32 height) = 0;
-  // Invokes ProcessKeyEvent method call. |callback| shold not be null-callback.
+  // Invokes ProcessKeyEvent method call. |callback| should not be null.
   virtual void ProcessKeyEvent(uint32 keyval,
                                uint32 keycode,
                                uint32 state,
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.cc b/chromeos/dbus/ibus/ibus_lookup_table.cc
index 5995403..a4fb1f0 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table.cc
@@ -100,7 +100,7 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
   bool cursor_visible = true;
   if (!ibus_object_reader.PopBool(&cursor_visible)) {
     LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
-               << "3rd arugment should be boolean.";
+               << "3rd argument should be boolean.";
     return false;
   }
   table->set_is_cursor_visible(cursor_visible);
@@ -115,7 +115,7 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
   int32 orientation = 0;
   if (!ibus_object_reader.PopInt32(&orientation)) {
     LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
-               << "5th arguemnt should be int32.";
+               << "5th argument should be int32.";
     return false;
   }
   table->set_orientation(
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.h b/chromeos/dbus/ibus/ibus_lookup_table.h
index d87bf55..6fcc64a 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.h
+++ b/chromeos/dbus/ibus/ibus_lookup_table.h
@@ -22,7 +22,7 @@ namespace ibus {
 
 // The IBusLookupTable is one of IBusObjects. IBusLookupTable contains IBusTexts
 // but all of them are used as plain string. The overview of each data
-// strucutres is as follows:
+// structure is as follows:
 //
 // DATA STRUCTURE OVERVIEW:
 //  variant  struct {
@@ -70,7 +70,7 @@ namespace ibus {
 class IBusLookupTable;
 
 // Pops a IBusLookupTable from |reader|.
-// Returns false if an error occures.
+// Returns false if an error occurs.
 bool CHROMEOS_EXPORT PopIBusLookupTable(dbus::MessageReader* reader,
                                         IBusLookupTable* table);
 // Appends a IBusLookupTable to |writer| except mozc_candidates_ in |table|.
@@ -112,7 +112,7 @@ class CHROMEOS_EXPORT IBusLookupTable {
     cursor_position_ = cursor_position;
   }
 
-  // Returns true if the cusros is visible.
+  // Returns true if the cursor is visible.
   bool is_cursor_visible() const { return is_cursor_visible_; }
   void set_is_cursor_visible(bool is_cursor_visible) {
     is_cursor_visible_ = is_cursor_visible;
diff --git a/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc b/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
index 78bde2a..6d910cd 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table_unittest.cc
@@ -17,7 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removale.
+// TODO(nona): Remove ibus namespace after complete libibus removal.
 namespace ibus {
 
 TEST(IBusLookupTable, WriteReadTest) {
diff --git a/chromeos/dbus/ibus/ibus_object.cc b/chromeos/dbus/ibus/ibus_object.cc
index d4292f9..9b3399a 100644
--- a/chromeos/dbus/ibus/ibus_object.cc
+++ b/chromeos/dbus/ibus/ibus_object.cc
@@ -88,20 +88,20 @@ bool IBusObjectReader::Init() {
 
     std::string key;
     if (!dictionary_reader.PopString(&key)) {
-      LOG(ERROR) << "Invalid attachement structure: "
+      LOG(ERROR) << "Invalid attachment structure: "
                  << "The 1st dictionary entry should be string.";
       return false;
     }
 
     if (key.empty()) {
-      LOG(ERROR) << "Invalid attachement key: key is empty.";
+      LOG(ERROR) << "Invalid attachment key: key is empty.";
       return false;
     }
 
     dbus::MessageReader variant_reader(NULL);
     if (!dictionary_reader.PopVariant(&variant_reader)) {
       LOG(ERROR) << "Invalid attachment structure: "
-                 << "The 2nd dictionary entry shuold be variant.";
+                 << "The 2nd dictionary entry should be variant.";
       return false;
     }
 
diff --git a/chromeos/dbus/ibus/ibus_object.h b/chromeos/dbus/ibus/ibus_object.h
index 66defa6..413b3f3 100644
--- a/chromeos/dbus/ibus/ibus_object.h
+++ b/chromeos/dbus/ibus/ibus_object.h
@@ -28,10 +28,10 @@ namespace chromeos {
 namespace ibus {
 
 // The data structure of IBusObject is represented as variant in "(sav...)"
-// signatur. The IBusObject is constructed with two sections, header and
+// signature. The IBusObject is constructed with two sections, header and
 // contents. The header section is represent as "sav" which contains type name
 // and attachment array. The contents section is corresponding to "..." in
-// above signature, which can store arbitary type values including IBusObject.
+// above signature, which can store arbitrary type values including IBusObject.
 //
 // DATA STRUCTURE OVERVIEW:
 //
@@ -78,7 +78,7 @@ namespace ibus {
 // and type name before reading contents.
 //
 // EXAPMLE USAGE:
-//   // Craetes reader for IBusText
+//   // Creates reader for IBusText
 //   IBusObjectReader object_reader("IBusText", &reader);
 //
 //   // Initialize for reading attachment field.
diff --git a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
index 9981dc4..8f73e12 100644
--- a/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_panel_service_unittest.cc
@@ -61,7 +61,7 @@ class EmptyResponseVerifier {
   explicit EmptyResponseVerifier(uint32 expected_serial_number)
       : expected_serial_number_(expected_serial_number) {}
 
-  // Verifies the given |resposne| has no argument.
+  // Verifies the given |response| has no argument.
   void Verify(dbus::Response* response) {
     scoped_ptr<dbus::Response> response_deleter(response);
     EXPECT_EQ(expected_serial_number_, response->GetReplySerial());
@@ -424,7 +424,7 @@ TEST_F(IBusPanelServiceTest, UpdatePreeditTextTest) {
 }
 
 TEST_F(IBusPanelServiceTest, CursorUpTest) {
-  // Set expetations.
+  // Set expectations.
   NullArgumentVerifier evaluator(ibus::panel::kCursorUpSignal);
   EXPECT_CALL(*mock_exported_object_, SendSignal(_))
       .WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
@@ -434,7 +434,7 @@ TEST_F(IBusPanelServiceTest, CursorUpTest) {
 }
 
 TEST_F(IBusPanelServiceTest, CursorDownTest) {
-  // Set expetations.
+  // Set expectations.
   NullArgumentVerifier evaluator(ibus::panel::kCursorDownSignal);
   EXPECT_CALL(*mock_exported_object_, SendSignal(_))
       .WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
@@ -444,7 +444,7 @@ TEST_F(IBusPanelServiceTest, CursorDownTest) {
 }
 
 TEST_F(IBusPanelServiceTest, PageUpTest) {
-  // Set expetations.
+  // Set expectations.
   NullArgumentVerifier evaluator(ibus::panel::kPageUpSignal);
   EXPECT_CALL(*mock_exported_object_, SendSignal(_))
       .WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
@@ -454,7 +454,7 @@ TEST_F(IBusPanelServiceTest, PageUpTest) {
 }
 
 TEST_F(IBusPanelServiceTest, PageDownTest) {
-  // Set expetations.
+  // Set expectations.
   NullArgumentVerifier evaluator(ibus::panel::kPageDownSignal);
   EXPECT_CALL(*mock_exported_object_, SendSignal(_))
       .WillOnce(Invoke(&evaluator, &NullArgumentVerifier::Verify));
diff --git a/chromeos/dbus/ibus/ibus_property.cc b/chromeos/dbus/ibus/ibus_property.cc
index c4147f6..5bbde66 100644
--- a/chromeos/dbus/ibus/ibus_property.cc
+++ b/chromeos/dbus/ibus/ibus_property.cc
@@ -65,7 +65,7 @@ bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
   }
   property->set_tooltip(tooltip);
 
-  // The 6th bool argument represents whther the property is event sensitive or
+  // The 6th bool argument represents whether the property is event sensitive or
   // not, but not supported in Chrome OS.
   bool sensitive = true;
   if (!ibus_property_reader.PopBool(&sensitive)) {
diff --git a/chromeos/dbus/ibus/ibus_property.h b/chromeos/dbus/ibus/ibus_property.h
index 4b5d5ff..b8646b42 100644
--- a/chromeos/dbus/ibus/ibus_property.h
+++ b/chromeos/dbus/ibus/ibus_property.h
@@ -22,11 +22,11 @@ class IBusProperty;
 typedef ScopedVector<IBusProperty> IBusPropertyList;
 
 // Pops a IBusProperty from |reader|.
-// Returns false if an error occures.
+// Returns false if an error occurs.
 bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
                                      IBusProperty* property);
 // Pops a IBusPropertyList from |reader|.
-// Returns false if an error occures.
+// Returns false if an error occurs.
 bool CHROMEOS_EXPORT PopIBusPropertyList(dbus::MessageReader* reader,
                                          IBusPropertyList* property_list);
 
diff --git a/chromeos/dbus/ibus/ibus_text.cc b/chromeos/dbus/ibus/ibus_text.cc
index a60ffe5..e905af8 100644
--- a/chromeos/dbus/ibus/ibus_text.cc
+++ b/chromeos/dbus/ibus/ibus_text.cc
@@ -29,7 +29,7 @@ struct IBusAttribute {
 };
 
 // Pops a IBusAttribute from |reader|.
-// Returns false if an error is occures.
+// Returns false if an error occurs.
 bool PopIBusAttribute(dbus::MessageReader* reader, IBusAttribute* attribute) {
   IBusObjectReader ibus_object_reader("IBusAttribute", reader);
   if (!ibus_object_reader.Init())
diff --git a/chromeos/dbus/ibus/ibus_text.h b/chromeos/dbus/ibus/ibus_text.h
index 57af587..5997d0c 100644
--- a/chromeos/dbus/ibus/ibus_text.h
+++ b/chromeos/dbus/ibus/ibus_text.h
@@ -20,7 +20,7 @@ namespace chromeos {
 namespace ibus {
 
 // The IBusText is one of IBusObjects and it contains IBusAttrList object which
-// contains array of IBusAttribute object. The overview of each data strucutres
+// contains array of IBusAttribute object. The overview of each data structure
 // is as follows:
 //
 // DATA STRUCTURE OVERVIEW:
@@ -79,7 +79,7 @@ namespace ibus {
 class IBusText;
 
 // Pops a IBusText from |reader|.
-// Returns false if an error occures.
+// Returns false if an error occurs.
 bool CHROMEOS_EXPORT PopIBusText(dbus::MessageReader* reader,
                                  IBusText* ibus_text);
 // Pops a IBusText from |reader| and stores it's text field into text. Use
diff --git a/chromeos/dbus/ibus/mock_ibus_engine_factory_service.cc b/chromeos/dbus/ibus/mock_ibus_engine_factory_service.cc
index 4660c9f..af990be9 100644
--- a/chromeos/dbus/ibus/mock_ibus_engine_factory_service.cc
+++ b/chromeos/dbus/ibus/mock_ibus_engine_factory_service.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 
 namespace chromeos {
diff --git a/chromeos/dbus/ibus/mock_ibus_input_context_client.cc b/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
index ecc4202..073f65d 100644
--- a/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
+++ b/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <string>
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
 
 namespace chromeos {
diff --git a/chromeos/dbus/ibus/mock_ibus_panel_service.h b/chromeos/dbus/ibus/mock_ibus_panel_service.h
index 5269a84..4d38784 100644
--- a/chromeos/dbus/ibus/mock_ibus_panel_service.h
+++ b/chromeos/dbus/ibus/mock_ibus_panel_service.h
@@ -5,7 +5,6 @@
 #ifndef CHROMEOS_DBUS_IBUS_MOCK_IBUS_PANEL_SERVICE_H_
 #define CHROMEOS_DBUS_IBUS_MOCK_IBUS_PANEL_SERVICE_H_
 
-#include <string>
 #include "chromeos/dbus/ibus/ibus_panel_service.h"
 
 namespace chromeos {