cashew: gmock integration

src/main.cc

-// 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.
 
 #include <config.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 107 matching lines @@
     LOG(ERROR) << "couldn't create dbus dispatcher";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
   DBus::default_dispatcher = cashew::dispatcher;
   cashew::dispatcher->attach(NULL);
 
   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";
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "creating cashew server";
   // TODO(vlaviano): can we share a single conn for client and server roles?
   DBus::Connection server_conn = DBus::Connection::SystemBus();
@@ skipping 12 matching lines @@
     cashew::CleanUpForExit();
     exit(EXIT_FAILURE);
   }
 
   DLOG(INFO) << "entering event loop";
   g_main_loop_run(cashew::main_loop);
   DLOG(INFO) << "exited event loop";
   cashew::CleanUpForExit();
   exit(EXIT_SUCCESS);
 }