Reporting of policy errors via host-offline-reason: part 1

remoting/host/it2me/it2me_host.cc

 // Copyright 2013 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 "remoting/host/it2me/it2me_host.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
@@ skipping 52 matching lines @@
 
   desktop_environment_factory_.reset(new It2MeDesktopEnvironmentFactory(
       host_context_->network_task_runner(),
       host_context_->input_task_runner(),
       host_context_->ui_task_runner()));
 
   // Start monitoring configured policies.
   policy_watcher_.reset(
       policy_hack::PolicyWatcher::Create(host_context_->network_task_runner()));
   policy_watcher_->StartWatching(
-      base::Bind(&It2MeHost::OnPolicyUpdate, this));
+      base::Bind(&It2MeHost::OnPolicyUpdate, this),
+      base::Bind(&It2MeHost::OnPolicyError, this));
 
   // Switch to the network thread to start the actual connection.
   host_context_->network_task_runner()->PostTask(
       FROM_HERE, base::Bind(&It2MeHost::ReadPolicyAndConnect, this));
 }
 
 void It2MeHost::Disconnect() {
   if (!host_context_->network_task_runner()->BelongsToCurrentThread()) {
     DCHECK(task_runner_->BelongsToCurrentThread());
     host_context_->network_task_runner()->PostTask(
@@ skipping 241 matching lines @@
   }
 
   policy_received_ = true;
 
   if (!pending_connect_.is_null()) {
     pending_connect_.Run();
     pending_connect_.Reset();
   }
 }
 
+void It2MeHost::OnPolicyError() {

[Lambros, 2014/11/13 00:30:26]

optional: NOTIMPLEMENTED()

[Łukasz Anforowicz, 2014/11/13 17:48:08]

Done.  I hope that the default policy (4 -- [default] LOG(ERROR) at runtime)
from base/logging.h is in effect. 

+  // TODO(lukasza): figure out what to do here...

[Lambros, 2014/11/13 00:30:26]

Maybe keep this simple and just say "Report the policy error to the user."

[Łukasz Anforowicz, 2014/11/13 17:48:08]

Done.

+  //                we possibly need equivalent of
+  //                  void ShutdownHost(HostExitCodes exit_code);
+  //                from me2me host (ideally this would be in some kind
+  //                of shared code to avoid duplication)
+}
+
 void It2MeHost::UpdateNatPolicy(bool nat_traversal_enabled) {
   DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread());
 
   VLOG(2) << "UpdateNatPolicy: " << nat_traversal_enabled;
 
   // When transitioning from enabled to disabled, force disconnect any
   // existing session.
   if (nat_traversal_enabled_ && !nat_traversal_enabled && IsConnected()) {
     Disconnect();
   }
@@ skipping 122 matching lines @@
     ChromotingHostContext* context,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     base::WeakPtr<It2MeHost::Observer> observer,
     const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
     const std::string& directory_bot_jid) {
   return new It2MeHost(
       context, task_runner, observer, xmpp_server_config, directory_bot_jid);
 }
 
 }  // namespace remoting