Fix up mac test client and simple host for remoting.

remoting/protocol/protocol_test_client.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 extern "C" {
 #include <unistd.h>
 }
 #endif  // !defined(OS_WIN)
 
 #include <iostream>
 #include <list>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/nss_util.h"
+#include "base/test/mock_chrome_application_mac.h"
 #include "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/jingle_glue/jingle_client.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/protocol/jingle_session_manager.h"
 
@@ skipping 318 matching lines @@
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 
   if (!cmd_line->args().empty() || cmd_line->HasSwitch("help"))
     usage(argv[0]);
 
   base::AtExitManager exit_manager;
 
   base::EnsureNSPRInit();
   base::EnsureNSSInit();
 
+#if defined(OS_MACOSX)
+  mock_cr_app::RegisterMockCrApp();
+#endif  // OS_MACOSX
+
   std::string host_jid(cmd_line->GetSwitchValueASCII("host_jid"));
 
   if (!cmd_line->HasSwitch("username"))
     usage(argv[0]);
   std::string username(cmd_line->GetSwitchValueASCII("username"));
 
   if (!cmd_line->HasSwitch("auth_token"))
     usage(argv[0]);
   std::string auth_token(cmd_line->GetSwitchValueASCII("auth_token"));
 
   scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient());
 
   client->Run(username, auth_token, host_jid);
 
   return 0;
 }