Fix typos in the message test.

dbus/message_unittest.cc

 // 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.
 
 #include "dbus/message.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 362 matching lines @@
 }
 
 TEST(MessageTest, Response) {
   dbus::Response response;
   EXPECT_TRUE(response.raw_message() == NULL);
   response.reset_raw_message(
       dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN));
   EXPECT_EQ(dbus::Message::MESSAGE_METHOD_RETURN, response.GetMessageType());
 }
 
-TEST(MergeTest, Response_FromMethodCall) {
+TEST(MessageTest, Response_FromMethodCall) {
   const uint32 kSerial = 123;
   dbus::MethodCall method_call("com.example.Interface", "SomeMethod");
   method_call.SetSerial(kSerial);
 
   scoped_ptr<dbus::Response> response(
       dbus::Response::FromMethodCall(&method_call));
   EXPECT_EQ(dbus::Message::MESSAGE_METHOD_RETURN, response->GetMessageType());
   // The serial should be copied to the reply serial.
   EXPECT_EQ(kSerial, response->GetReplySerial());
 }
 
-TEST(MergeTest, ErrorResponse) {
+TEST(MessageTest, ErrorResponse) {
   dbus::ErrorResponse error_response;
   EXPECT_TRUE(error_response.raw_message() == NULL);
   error_response.reset_raw_message(
       dbus_message_new(DBUS_MESSAGE_TYPE_ERROR));
   EXPECT_EQ(dbus::Message::MESSAGE_ERROR, error_response.GetMessageType());
 }
 
-TEST(MergeTest, ErrorResponse_FromMethodCall) {
+TEST(MessageTest, ErrorResponse_FromMethodCall) {
   const uint32 kSerial = 123;
 const char kErrorMessage[] = "error message";
 
   dbus::MethodCall method_call("com.example.Interface", "SomeMethod");
   method_call.SetSerial(kSerial);
 
   scoped_ptr<dbus::ErrorResponse> error_response(
       dbus::ErrorResponse::FromMethodCall(&method_call,
                                           DBUS_ERROR_FAILED,
                                           kErrorMessage));
@@ skipping 37 matching lines @@
 
   EXPECT_EQ("org.chromium.destination", message.GetDestination());
   EXPECT_EQ("/org/chromium/path", message.GetPath());
   EXPECT_EQ("org.chromium.interface", message.GetInterface());
   EXPECT_EQ("member", message.GetMember());
   EXPECT_EQ("org.chromium.error", message.GetErrorName());
   EXPECT_EQ(":1.2", message.GetSender());
   EXPECT_EQ(123U, message.GetSerial());
   EXPECT_EQ(456U, message.GetReplySerial());
 }