Fix typos in the D-Bus library.

Just wanted to remove the blank line in bus.h, but
fixed typos along the way.

BUG=chromium:90036
TEST=dbus_unittests

Review URL: http://codereview.chromium.org/7792049

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

7 files changed, 17 insertions, 17 deletions

diff --git a/dbus/bus.cc b/dbus/bus.cc
index 550f390..1b766acd 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -150,7 +150,7 @@ class Timeout : public base::RefCountedThreadSafe<Timeout> {
     // occur if this function is called after Bus::OnRemoveTimeout().
     if (is_completed)
       return;
-    // Skip if monitoring is cancled.
+    // Skip if monitoring is canceled.
     if (!monitoring_is_active_)
       return;
 
@@ -332,7 +332,7 @@ bool Bus::RequestOwnership(const std::string& service_name) {
                                            DBUS_NAME_FLAG_DO_NOT_QUEUE,
                                            error.get());
   if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-    LOG(ERROR) << "Failed to get the onwership of " << service_name << ": "
+    LOG(ERROR) << "Failed to get the ownership of " << service_name << ": "
                << (dbus_error_is_set(error.get()) ? error.message() : "");
     return false;
   }
@@ -360,7 +360,7 @@ bool Bus::ReleaseOwnership(const std::string& service_name) {
     owned_service_names_.erase(found);
     return true;
   } else {
-    LOG(ERROR) << "Failed to release the onwership of " << service_name << ": "
+    LOG(ERROR) << "Failed to release the ownership of " << service_name << ": "
                << (error.is_set() ? error.message() : "");
     return false;
   }
diff --git a/dbus/bus.h b/dbus/bus.h
index 2f8d215..792eb83 100644
--- a/dbus/bus.h
+++ b/dbus/bus.h
@@ -1,4 +1,3 @@
-
 // Copyright (c) 2011 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.
@@ -15,6 +14,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/threading/platform_thread.h"
 #include "base/tracked_objects.h"
 
 class MessageLoop;
@@ -42,7 +42,7 @@ class ObjectProxy;
 // In the D-Bus library, we use the two threads:
 //
 // - The origin thread: the thread that created the Bus object.
-// - The D-Bus thread: the thread supplifed by |dbus_thread| option.
+// - The D-Bus thread: the thread supplied by |dbus_thread| option.
 //
 // The origin thread is usually Chrome's UI thread. The D-Bus thread is
 // usually a dedicated thread for the D-Bus library.
@@ -57,7 +57,7 @@ class ObjectProxy;
 // or not (ex. dbus_bus_request_name() internally calls
 // dbus_connection_send_with_reply_and_block(), which is a blocking
 // call). To err on the safe side, we consider all libdbus functions that
-// deal with the connection to dbus-damoen to be blocking.
+// deal with the connection to dbus-daemon to be blocking.
 //
 // SHUTDOWN
 //
@@ -120,7 +120,7 @@ class ObjectProxy;
 //
 // Bus is a ref counted object, to ensure that |this| of the object is
 // alive when callbacks referencing |this| are called. However, after
-// Shutdown() is called, |connection_| can be NULL. Hence, calbacks should
+// Shutdown() is called, |connection_| can be NULL. Hence, callbacks should
 // not rely on that |connection_| is alive.
 class Bus : public base::RefCountedThreadSafe<Bus> {
  public:
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc
index 33e785d..41b06b6 100644
--- a/dbus/end_to_end_async_unittest.cc
+++ b/dbus/end_to_end_async_unittest.cc
@@ -18,7 +18,7 @@
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// The end-to-end test exercises the asynchronos APIs in ObjectProxy and
+// The end-to-end test exercises the asynchronous APIs in ObjectProxy and
 // ExportedObject.
 class EndToEndAsyncTest : public testing::Test {
  public:
@@ -69,7 +69,7 @@ class EndToEndAsyncTest : public testing::Test {
     bus_->Shutdown(base::Bind(&EndToEndAsyncTest::OnShutdown,
                               base::Unretained(this)));
     // Wait until the bus is shutdown. OnShutdown() will be called in
-    // mesage_loop_.
+    // message_loop_.
     message_loop_.Run();
 
     // Shut down the service.
@@ -79,13 +79,13 @@ class EndToEndAsyncTest : public testing::Test {
     // Reset to the default.
     base::ThreadRestrictions::SetIOAllowed(true);
 
-    // Stopping a thread is considred an IO operation, so do this after
+    // Stopping a thread is considered an IO operation, so do this after
     // allowing IO.
     test_service_->Stop();
   }
 
  protected:
-  // Calls the method asynchronosly. OnResponse() will be called once the
+  // Calls the method asynchronously. OnResponse() will be called once the
   // response is received.
   void CallMethod(dbus::MethodCall* method_call,
                   int timeout_ms) {
@@ -238,7 +238,7 @@ TEST_F(EndToEndAsyncTest, TestSignal) {
   const char kMessage[] = "hello, world";
   // Send the test signal from the exported object.
   test_service_->SendTestSignal(kMessage);
-  // Receive the signal with the object proxy. The signal is handeled in
+  // Receive the signal with the object proxy. The signal is handled in
   // EndToEndAsyncTest::OnTestSignal() in the main thread.
   WaitForTestSignal();
   ASSERT_EQ(kMessage, test_signal_string_);
diff --git a/dbus/end_to_end_sync_unittest.cc b/dbus/end_to_end_sync_unittest.cc
index 87b261f..8968985 100644
--- a/dbus/end_to_end_sync_unittest.cc
+++ b/dbus/end_to_end_sync_unittest.cc
@@ -10,7 +10,7 @@
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// The end-to-end test exercises the synchronos APIs in ObjectProxy and
+// The end-to-end test exercises the synchronous APIs in ObjectProxy and
 // ExportedObject. The test will launch a thread for the service side
 // operations (i.e. ExportedObject side).
 class EndToEndSyncTest : public testing::Test {
diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc
index df536f5..8d36d15 100644
--- a/dbus/exported_object.cc
+++ b/dbus/exported_object.cc
@@ -170,7 +170,7 @@ bool ExportedObject::Register() {
                                                    this,
                                                    error.get());
   if (!success) {
-    LOG(ERROR) << "Failed to regiser the object: " << object_path_ << ": "
+    LOG(ERROR) << "Failed to register the object: " << object_path_ << ": "
                << (error.is_set() ? error.message() : "");
     return false;
   }
@@ -239,7 +239,7 @@ DBusHandlerResult ExportedObject::HandleMessage(
   }
 
   if (!response) {
-    // Something bad happend in the method call.
+    // Something bad happened in the method call.
     scoped_ptr<dbus::ErrorResponse> error_response(
         ErrorResponse::FromMethodCall(method_call.get(),
                                       DBUS_ERROR_FAILED,
diff --git a/dbus/message.h b/dbus/message.h
index 0a692de..69fb53b 100644
--- a/dbus/message.h
+++ b/dbus/message.h
@@ -186,7 +186,7 @@ class Response : public Message {
   // exported methods.
   static Response* FromMethodCall(MethodCall* method_call);
 
-  // Returns a newly creaed Response with an empty payload. The caller
+  // Returns a newly created Response with an empty payload. The caller
   // must delete the returned object. Useful for testing.
   static Response* CreateEmpty();
 
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc
index 7452b1d..fdb7b27 100644
--- a/dbus/object_proxy.cc
+++ b/dbus/object_proxy.cc
@@ -218,7 +218,7 @@ void ObjectProxy::RunResponseCallback(ResponseCallback response_callback,
     // This will take |response_message| and release (unref) it.
     scoped_ptr<dbus::Response> response(
         dbus::Response::FromRawMessage(response_message));
-    // The response is successfuly received.
+    // The response is successfully received.
     response_callback.Run(response.get());
   }
 }