Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1429)

Unified Diff: remoting/protocol/protocol_test_client.cc

Issue 6461023: Fix up mac test client and simple host for remoting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/protocol_test_client.cc
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index cf8d486152031ff4ae73e2de9373d40f305462e7..849bbd7dc4cb2c41ed61bb95e6c8367820e0f1ad 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -16,6 +16,7 @@ extern "C" {
#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"
@@ -354,6 +355,10 @@ int main(int argc, char** argv) {
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"))
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698