Fixing a few crashes in the me2me native messaging host.

remoting/host/setup/me2me_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_ME2ME_NATIVE_MESSAGING_HOST_H_
 #define REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 30 matching lines @@
       bool needs_elevation,
       scoped_ptr<NativeMessagingChannel> channel,
       scoped_refptr<DaemonController> daemon_controller,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
       scoped_ptr<OAuthClient> oauth_client);
   virtual ~Me2MeNativeMessagingHost();
 
   void Start(const base::Closure& quit_closure);
 
  private:
+  // Callback to process messages from the native messaging client through
+  // |channel_|.
   void ProcessRequest(scoped_ptr<base::DictionaryValue> message);
 
   // These "Process.." methods handle specific request types. The |response|
   // dictionary is pre-filled by ProcessMessage() with the parts of the
   // response already known ("id" and "type" fields).
   void ProcessHello(
       scoped_ptr<base::DictionaryValue> message,
       scoped_ptr<base::DictionaryValue> response);
   void ProcessClearPairedClients(
       scoped_ptr<base::DictionaryValue> message,
@@ skipping 54 matching lines @@
   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);
 
   void OnError();
 
   void Stop();
 
-  void DelegateToElevatedHost(scoped_ptr<base::DictionaryValue> message,
-                              scoped_ptr<base::DictionaryValue> response);
+  // Returns true if the request was successfully delegated to the elevated
+  // host and false otherwise.
+  bool DelegateToElevatedHost(scoped_ptr<base::DictionaryValue> message);
 
 #if defined(OS_WIN)
+  // Create and connect to an elevated host process if necessary.
+  // |elevated_channel_| will contain the native messaging channel to the
+  // elevated host if the function succeeds.
   void Me2MeNativeMessagingHost::EnsureElevatedHostCreated();
+
+  // Callback to process messages from the elevated host through
+  // |elevated_channel_|.
   void ProcessDelegateResponse(scoped_ptr<base::DictionaryValue> message);
 
-  // input/output handles for the channel to the elevated host.
-  base::win::ScopedHandle delegate_write_handle_;
-  base::win::ScopedHandle delegate_read_handle_;
+  // Native messaging channel used to communicate with the elevated host.
   scoped_ptr<NativeMessagingChannel> elevated_channel_;
 #endif  // defined(OS_WIN)
 
   bool needs_elevation_;
   base::Closure quit_closure_;
+
+  // Native messaging channel used to communicate with the native message
+  // client.
   scoped_ptr<NativeMessagingChannel> channel_;
   scoped_refptr<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_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtr<Me2MeNativeMessagingHost> weak_ptr_;
   base::WeakPtrFactory<Me2MeNativeMessagingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost);
 };
 
 // Creates a Me2MeNativeMessagingHost instance, attaches it to stdin/stdout and
 // runs the message loop until Me2MeNativeMessagingHost signals shutdown.
 int Me2MeNativeMessagingHostMain();
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_