Expose nat_traversal flag to host and client plugins.

BUG=90213
TEST=None

Review URL: http://codereview.chromium.org/7471054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94119 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index a5664dd..e58fd59 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -178,6 +178,7 @@ class SimpleHost {
     // Construct a chromoting host.
     scoped_refptr<ChromotingHost> host;
     logger_.reset(new remoting::Logger());
+    DesktopEnvironment* desktop_environment;
     if (fake_) {
       remoting::Capturer* capturer =
           new remoting::CapturerFake();
@@ -191,16 +192,17 @@ class SimpleHost {
           remoting::ContinueWindow::Create();
       remoting::LocalInputMonitor* local_input_monitor =
           remoting::LocalInputMonitor::Create();
-      host = ChromotingHost::Create(
-          &context, config,
+      desktop_environment =
           new DesktopEnvironment(&context, capturer, event_executor, curtain,
                                  disconnect_window, continue_window,
-                                 local_input_monitor),
-          access_verifier.release(), logger_.get());
+                                 local_input_monitor);
     } else {
-      host = ChromotingHost::Create(&context, config,
-                                    access_verifier.release(), logger_.get());
+      desktop_environment = DesktopEnvironment::Create(&context);
     }
+
+    host = ChromotingHost::Create(&context, config, desktop_environment,
+                                  access_verifier.release(), logger_.get(),
+                                  false);
     host->set_it2me(is_it2me_);
 
     if (protocol_config_.get()) {