cashew: gmock integration

src/main.cc

Index: src/main.cc
diff --git a/src/main.cc b/src/main.cc
index 6019a285e378b14c7916e77a05352511ec5930fa..572969fcb4c99334920d746d06f667b5892eb10f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2010, 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -126,7 +126,7 @@ int main(int argc, char *argv[]) {
   DLOG(INFO) << "creating service manager";
   DBus::Connection client_conn = DBus::Connection::SystemBus();
   client_conn.set_timeout(cashew::kDBusConnectionTimeoutMilliseconds);
-  cashew::service_manager = new(std::nothrow) cashew::ServiceManager(
+  cashew::service_manager = cashew::ServiceManager::NewServiceManager(
       client_conn, cashew::main_loop);
   if (cashew::service_manager == NULL) {
     LOG(ERROR) << "couldn't create service manager";