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

remoting/host/setup/native_messaging_host.h

 // 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.
 
 #ifndef REMOTING_HOST_SETUP_NATIVE_MESSAGING_HOST_H_
 #define REMOTING_HOST_SETUP_NATIVE_MESSAGING_HOST_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 namespace remoting {
 
 namespace protocol {
 class PairingRegistry;
 }  // namespace protocol
 
 // Implementation of the native messaging host process.
 class NativeMessagingHost {
  public:
   NativeMessagingHost(
-      scoped_ptr<DaemonController> daemon_controller,
+      scoped_refptr<DaemonController> daemon_controller,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
       scoped_ptr<OAuthClient> oauth_client,
       base::PlatformFile input,
       base::PlatformFile output,
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       const base::Closure& quit_closure);
   ~NativeMessagingHost();
 
   // Starts reading and processing messages.
   void Start();
@@ skipping 47 matching lines @@
   void SendResponse(scoped_ptr<base::DictionaryValue> response);
 
   // These Send... methods get called on the DaemonController's internal thread,
   // or on the calling thread if called by the PairingRegistry.
   // These methods fill in the |response| dictionary from the other parameters,
   // and pass it to SendResponse().
   void SendConfigResponse(scoped_ptr<base::DictionaryValue> response,
                           scoped_ptr<base::DictionaryValue> config);
   void SendPairedClientsResponse(scoped_ptr<base::DictionaryValue> response,
                                  scoped_ptr<base::ListValue> pairings);
-  void SendUsageStatsConsentResponse(scoped_ptr<base::DictionaryValue> response,
-                                     bool supported,
-                                     bool allowed,
-                                     bool set_by_policy);
+  void SendUsageStatsConsentResponse(
+      scoped_ptr<base::DictionaryValue> response,
+      const DaemonController::UsageStatsConsent& consent);
   void SendAsyncResult(scoped_ptr<base::DictionaryValue> response,
                        DaemonController::AsyncResult result);
   void SendBooleanResult(scoped_ptr<base::DictionaryValue> response,
                          bool result);
   void SendCredentialsResponse(scoped_ptr<base::DictionaryValue> response,
                                const std::string& user_email,
                                const std::string& refresh_token);
 
   // Callbacks may be invoked by e.g. DaemonController during destruction,
   // which use |weak_ptr_|, so it's important that it be the last member to be
   // destroyed.
   base::WeakPtr<NativeMessagingHost> weak_ptr_;
 
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
   base::Closure quit_closure_;
 
   NativeMessagingReader native_messaging_reader_;
   NativeMessagingWriter native_messaging_writer_;
 
   // The DaemonController may post tasks to this object during destruction (but
   // not afterwards), so it needs to be destroyed before other members of this
   // class (except for |weak_factory_|).
-  scoped_ptr<remoting::DaemonController> daemon_controller_;
+  scoped_refptr<remoting::DaemonController> daemon_controller_;
 
   // Used to load and update the paired clients for this host.
   scoped_refptr<protocol::PairingRegistry> pairing_registry_;
 
   // Used to exchange the service account authorization code for credentials.
   scoped_ptr<OAuthClient> oauth_client_;
 
   // Keeps track of pending requests. Used to delay shutdown until all responses
   // have been sent.
   int pending_requests_;
 
   // True if Shutdown() has been called.
   bool shutdown_;
 
   base::WeakPtrFactory<NativeMessagingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMessagingHost);
 };
 
 // Creates a NativeMessagingHost instance, attaches it to stdin/stdout and runs
 // the message loop until NativeMessagingHost signals shutdown.
 int NativeMessagingHostMain();
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SETUP_NATIVE_MESSAGING_HOST_H_