Revert 184837

chrome/renderer/extensions/dispatcher.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_RENDERER_EXTENSIONS_DISPATCHER_H_
 #define CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 102 matching lines @@
   }
 
   void OnExtensionResponse(int request_id,
                            bool success,
                            const base::ListValue& response,
                            const std::string& error);
 
   // Checks that the current context contains an extension that has permission
   // to execute the specified function. If it does not, a v8 exception is thrown
   // and the method returns false. Otherwise returns true.
-  bool CheckContextAccessToExtensionAPI(
-      const std::string& function_name, ChromeV8Context* context) const;
+  bool CheckCurrentContextAccessToExtensionAPI(
+      const std::string& function_name) const;
 
  private:
   friend class RenderViewTest;
   typedef void (*BindingInstaller)(ModuleSystem* module_system,
                                   v8::Handle<v8::Object> chrome,
                                   v8::Handle<v8::Object> chrome_hidden);
 
   // RenderProcessObserver implementation:
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void WebKitInitialized() OVERRIDE;
@@ skipping 47 matching lines @@
 
   // Sets up the host permissions for |extension|.
   void InitOriginPermissions(const Extension* extension);
   void AddOrRemoveOriginPermissions(
       UpdatedExtensionPermissionsInfo::Reason reason,
       const Extension* extension,
       const URLPatternSet& origins);
 
   void RegisterNativeHandlers(ModuleSystem* module_system,
                               ChromeV8Context* context);
-  void RegisterSchemaGeneratedBindings(ModuleSystem* module_system,
-                                       ChromeV8Context* context,
-                                       v8::Handle<v8::Context> v8_context);
 
   // Inserts static source code into |source_map_|.
   void PopulateSourceMap();
 
   // Inserts BindingInstallers into |lazy_bindings_map_|.
   void PopulateLazyBindingsMap();
 
   // Sets up the bindings for the given api.
   void InstallBindings(ModuleSystem* module_system,
                        v8::Handle<v8::Context> v8_context,
                        const std::string& api);
 
   // Determines whether |frame| is loading a platform app resource URL. (this
   // evaluates to true for iframes in platform apps and sandboxed resources that
   // are not in the same origin).
   bool IsWithinPlatformApp(const WebKit::WebFrame* frame);
 
   // Returns the Feature::Context type of context for a JavaScript context.
   Feature::Context ClassifyJavaScriptContext(const std::string& extension_id,
                                              int extension_group,
                                              const ExtensionURLInfo& url_info);
 
-  // Gets |field| from |object| or creates it as an empty object if it doesn't
-  // exist.
-  v8::Handle<v8::Object> GetOrCreateObject(v8::Handle<v8::Object> object,
-                                           const std::string& field);
-
   // True if this renderer is running extensions.
   bool is_extension_process_;
 
   // Contains all loaded extensions.  This is essentially the renderer
   // counterpart to ExtensionService in the browser. It contains information
   // about all extensions currently loaded by the browser.
   ExtensionSet extensions_;
 
   // All the bindings contexts that are currently loaded for this renderer.
   // There is zero or one for each v8 context.
@@ skipping 33 matching lines @@
 
   // Sends API requests to the extension host.
   scoped_ptr<RequestSender> request_sender_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_DISPATCHER_H_