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

Unified Diff: remoting/host/simple_host_process.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 | « base/message_pump_mac.mm ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 289da0f7a4f68f9e6225fd0e28fa84fef21990db..38eb8e09a5b5345cf8f12a82cabd0b5053daac9a 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -26,6 +26,7 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/nss_util.h"
#include "base/path_service.h"
+#include "base/test/mock_chrome_application_mac.h"
#include "base/threading/thread.h"
#include "media/base/media.h"
#include "remoting/base/tracer.h"
@@ -154,6 +155,10 @@ int main(int argc, char** argv) {
host->set_protocol_config(config.release());
}
+#if defined(OS_MACOSX)
+ mock_cr_app::RegisterMockCrApp();
+#endif // OS_MACOSX
+
// Let the chromoting host run until the shutdown task is executed.
MessageLoop message_loop(MessageLoop::TYPE_UI);
host->Start(NewRunnableFunction(&ShutdownTask, &message_loop));
« no previous file with comments | « base/message_pump_mac.mm ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698