Follow up cleanups for r222162.

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 208 matching lines @@
   // false on failure.
   bool LocalizeStringWithSubstitution(NPObject* localize_func,
                                       const char* tag,
                                       const char* substitution,
                                       string16* result);
 
   //////////////////////////////////////////////////////////
   // Helper methods for Me2Me host.
 
   // Helpers for GenerateKeyPair().
-  void DoGenerateKeyPair(const ScopedRefNPObject& callback);
-  void InvokeGenerateKeyPairCallback(const ScopedRefNPObject& callback,
+  static void DoGenerateKeyPair(
+      const scoped_refptr<AutoThreadTaskRunner>& plugin_task_runner,
+      const base::Callback<void (const std::string&,
+                                 const std::string&)>& callback);
+  void InvokeGenerateKeyPairCallback(scoped_ptr<ScopedRefNPObject> callback,
                                      const std::string& private_key,
                                      const std::string& public_key);
 
-
   // Callback handler for SetConfigAndStart(), Stop(), SetPin() and
   // SetUsageStatsConsent() in DaemonController.
-  void InvokeAsyncResultCallback(const ScopedRefNPObject& callback,
+  void InvokeAsyncResultCallback(scoped_ptr<ScopedRefNPObject> callback,
                                  DaemonController::AsyncResult result);
 
   // Callback handler for PairingRegistry methods that return a boolean
   // success status.
-  void InvokeBooleanCallback(const ScopedRefNPObject& callback, bool result);
+  void InvokeBooleanCallback(scoped_ptr<ScopedRefNPObject> callback,
+                             bool result);
 
   // Callback handler for DaemonController::GetConfig().
-  void InvokeGetDaemonConfigCallback(const ScopedRefNPObject& callback,
+  void InvokeGetDaemonConfigCallback(scoped_ptr<ScopedRefNPObject> callback,
                                      scoped_ptr<base::DictionaryValue> config);
 
   // Callback handler for DaemonController::GetVersion().
-  void InvokeGetDaemonVersionCallback(const ScopedRefNPObject& callback,
+  void InvokeGetDaemonVersionCallback(scoped_ptr<ScopedRefNPObject> callback,
                                       const std::string& version);
 
   // Callback handler for GetPairedClients().
   void InvokeGetPairedClientsCallback(
-      const ScopedRefNPObject& callback,
+      scoped_ptr<ScopedRefNPObject> callback,
       scoped_ptr<base::ListValue> paired_clients);
 
   // Callback handler for DaemonController::GetUsageStatsConsent().
   void InvokeGetUsageStatsConsentCallback(
-      const ScopedRefNPObject& callback,
+      scoped_ptr<ScopedRefNPObject> callback,
       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.
-  bool InvokeAndIgnoreResult(NPObject* func,
+  bool InvokeAndIgnoreResult(const ScopedRefNPObject& func,
                              const NPVariant* args,
                              uint32_t arg_count);
 
   // Set an exception for the current call.
   void SetException(const std::string& exception_string);
 
   //////////////////////////////////////////////////////////
   // Plugin state variables shared between It2Me and Me2Me.
 
   NPP plugin_;
@@ skipping 48 matching lines @@
   // 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_