Cleanup: make ExtensionRequestSender manage its IPC responses directly, rather

chrome/browser/extensions/extension_function.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 145 matching lines @@
   // Derived classes should implement this method to do their work and return
   // success/failure.
   virtual bool RunImpl() = 0;
 
   // Sends the result back to the extension.
   virtual void SendResponse(bool success) = 0;
 
   // Common implementation for SendResponse.
   void SendResponseImpl(base::ProcessHandle process,
                         IPC::Sender* ipc_sender,
-                        int routing_id,
                         bool success);
 
   // Called when we receive an extension api request that is invalid in a way
   // that JSON validation in the renderer should have caught. This should never
   // happen and could be an attacker trying to exploit the browser, so we crash
   // the renderer instead.
   void HandleBadMessage(base::ProcessHandle process);
 
   // Return true if the argument to this function at |index| was provided and
   // is non-null.
@@ skipping 173 matching lines @@
 // extension process happens on the IO thread). It's intended to be used when
 // performance is critical (e.g. the webRequest API which can block network
 // requests). Generally, UIThreadExtensionFunction is more appropriate and will
 // be easier to use and interface with the rest of the browser.
 class IOThreadExtensionFunction : public ExtensionFunction {
  public:
   IOThreadExtensionFunction();
 
   virtual IOThreadExtensionFunction* AsIOThreadExtensionFunction() OVERRIDE;
 
-  void set_ipc_sender(base::WeakPtr<ChromeRenderMessageFilter> ipc_sender,
-                      int routing_id) {
+  void set_ipc_sender(base::WeakPtr<ChromeRenderMessageFilter> ipc_sender) {
     ipc_sender_ = ipc_sender;
-    routing_id_ = routing_id;
   }
   ChromeRenderMessageFilter* ipc_sender() const { return ipc_sender_.get(); }
-  int routing_id() const { return routing_id_; }
 
   base::WeakPtr<ChromeRenderMessageFilter> ipc_sender_weak() const {
     return ipc_sender_;
   }
 
   void set_extension_info_map(const ExtensionInfoMap* extension_info_map) {
     extension_info_map_ = extension_info_map;
   }
   const ExtensionInfoMap* extension_info_map() const {
     return extension_info_map_.get();
   }
 
  protected:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::IO>;
   friend class base::DeleteHelper<IOThreadExtensionFunction>;
 
   virtual ~IOThreadExtensionFunction();
 
   virtual void Destruct() const OVERRIDE;
 
   virtual void SendResponse(bool success) OVERRIDE;
 
  private:
   base::WeakPtr<ChromeRenderMessageFilter> ipc_sender_;
-  int routing_id_;
 
   scoped_refptr<const ExtensionInfoMap> extension_info_map_;
 };
 
 // Base class for an extension function that runs asynchronously *relative to
 // the browser's UI thread*.
 class AsyncExtensionFunction : public UIThreadExtensionFunction {
  public:
   AsyncExtensionFunction();
 
@@ skipping 22 matching lines @@
  public:
   SyncIOThreadExtensionFunction();
 
   virtual void Run() OVERRIDE;
 
  protected:
   virtual ~SyncIOThreadExtensionFunction();
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_