chromeos::dbus lint errors.

dbus/test_service.cc

 // Copyright (c) 2012 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/test_service.h"
 
+#include <string>
+#include <vector>
+
 #include "base/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
@@ skipping 461 matching lines @@
     response_sender.Run(scoped_ptr<Response>());
     return;
   }
 
   if (action == "AddObject") {
     AddObject(object_path);
   } else if (action == "RemoveObject") {
     RemoveObject(object_path);
   } else if (action == "SetSendImmediatePropertiesChanged") {
     SetSendImmediatePropertiesChanged();
-  } if (action == "ReleaseOwnership") {
+  } else if (action == "ReleaseOwnership") {
     ReleaseOwnership(base::Bind(&TestService::PerformActionResponse,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
   } else if (action == "Ownership") {
     ReleaseOwnership(base::Bind(&TestService::OwnershipReleased,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
   }
@@ skipping 200 matching lines @@
   array_writer.OpenDictEntry(&dict_entry_writer);
   dict_entry_writer.AppendString("Name");
   dict_entry_writer.AppendVariantOfString(name);
   array_writer.CloseContainer(&dict_entry_writer);
   writer.CloseContainer(&array_writer);
 
   exported_object_->SendSignal(&signal);
 }
 
 }  // namespace dbus