[Chromoting] Hook up host talkgadget policy checks.

This updates the host to ping the specified talkgadget and block startup
if the talkgadget is not reachable. This permits admins to DNS block the
talkgadget to disable hosts from sharing out from their network.

Also, update the policy watcher to watch the correct location for Chromium builds.

BUG=132345,132681


Review URL: https://chromiumcodereview.appspot.com/10873050

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

1 files changed, 6 insertions, 1 deletions

diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 5d03329..6353a3d1 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -38,6 +38,7 @@
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/constants.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/dns_blackhole_checker.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/host/host_key_pair.h"
@@ -220,8 +221,10 @@ class SimpleHost : public HeartbeatSender::Listener {
     signal_strategy_.reset(new XmppSignalStrategy(
         context_.url_request_context_getter(),
         xmpp_login_, xmpp_auth_token_, xmpp_auth_service_));
+    scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(
+        new DnsBlackholeChecker(&context_, kDefaultHostTalkGadgetPrefix));
     signaling_connector_.reset(new SignalingConnector(
-        signal_strategy_.get(),
+        signal_strategy_.get(), &context_, dns_blackhole_checker.Pass(),
         base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
 
     if (fake_) {
@@ -304,6 +307,7 @@ class SimpleHost : public HeartbeatSender::Listener {
     log_to_server_.reset();
     heartbeat_sender_.reset();
     signaling_connector_.reset();
+    dns_blackhole_checker_.reset();
     signal_strategy_.reset();
 
     message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ -327,6 +331,7 @@ class SimpleHost : public HeartbeatSender::Listener {
   std::string xmpp_auth_service_;
 
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
+  scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker_;
   scoped_ptr<SignalingConnector> signaling_connector_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
   scoped_ptr<LogToServer> log_to_server_;