Refactor the daemon controller so that the callbacks are called on the caller thread.

remoting/host/plugin/host_script_object.h

 // Copyright (c) 2012 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.
 
 #ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 237 matching lines @@
   // Callback handler for DaemonController::GetVersion().
   void InvokeGetDaemonVersionCallback(const ScopedRefNPObject& callback,
                                       const std::string& version);
 
   // Callback handler for GetPairedClients().
   void InvokeGetPairedClientsCallback(
       const ScopedRefNPObject& callback,
       scoped_ptr<base::ListValue> paired_clients);
 
   // Callback handler for DaemonController::GetUsageStatsConsent().
-  void InvokeGetUsageStatsConsentCallback(const ScopedRefNPObject& callback,
-                                          bool supported,
-                                          bool allowed,
-                                          bool set_by_policy);
+  void InvokeGetUsageStatsConsentCallback(
+      const ScopedRefNPObject& callback,

[Wez, 2013/09/10 09:05:37]

nit: This, and any other methods that get bound to run off the plugin thread,
should be passed scoped_ptr<ScopedRefNPObject>&

(NPObject ref-counting isn't thread-safe)

[alexeypa (please no reviews), 2013/09/10 16:59:22]

Done.

+      const DaemonController::UsageStatsConsent& consent);
 
   //////////////////////////////////////////////////////////
   // Basic helper methods used for both It2Me and Me2me.
 
   // Call LogDebugInfo handler if there is one.
   // This must be called on the correct thread.
   void LogDebugInfo(const std::string& message);
 
   // Helper function for executing InvokeDefault on an NPObject, and ignoring
   // the return value.
@@ skipping 36 matching lines @@
   std::string directory_bot_jid_;
 
   // Callbacks to notify in response to |it2me_impl_| events.
   ScopedRefNPObject on_nat_traversal_policy_changed_func_;
   ScopedRefNPObject on_state_changed_func_;
 
   //////////////////////////////////////////////////////////
   // Me2Me host state.
 
   // Platform-specific installation & configuration implementation.
-  scoped_ptr<DaemonController> daemon_controller_;
+  scoped_refptr<DaemonController> daemon_controller_;
 
   // TODO(sergeyu): Replace this thread with
   // SequencedWorkerPool. Problem is that SequencedWorkerPool relies
   // on MessageLoopProxy::current().
   scoped_refptr<AutoThreadTaskRunner> worker_thread_;
 
   // Used to load and update the paired clients for this host.
   scoped_refptr<protocol::PairingRegistry> pairing_registry_;
 
   //////////////////////////////////////////////////////////
   // Plugin state used for both Ir2Me and Me2Me.
 
   // Used to cancel pending tasks for this object when it is destroyed.
   base::WeakPtrFactory<HostNPScriptObject> weak_factory_;
   base::WeakPtr<HostNPScriptObject> weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(HostNPScriptObject);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_