TBR: Revert "Miscellaneous API sprucing."

This reverts commit 052b8f424d1550deebf3dc562d7c47dde72d7f76.

Review URL: http://codereview.chromium.org/78001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13796 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 11 deletions

diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 3f53898..0e47b23 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -6,7 +6,6 @@
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
-#include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/js_only_v8_extensions.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/renderer_resources.h"
@@ -22,8 +21,7 @@ const char kExtensionName[] = "chrome/ExtensionProcessBindings";
 const char* kExtensionDeps[] = {
   BaseJsV8Extension::kName,
   JsonJsV8Extension::kName,
-  JsonSchemaJsV8Extension::kName,
-  RendererExtensionBindings::kName,
+  JsonSchemaJsV8Extension::kName
 };
 
 class ExtensionImpl : public v8::Extension {
diff --git a/chrome/renderer/extensions/renderer_extension_bindings.cc b/chrome/renderer/extensions/renderer_extension_bindings.cc
index 8035422..d9a73e6 100755
--- a/chrome/renderer/extensions/renderer_extension_bindings.cc
+++ b/chrome/renderer/extensions/renderer_extension_bindings.cc
@@ -27,12 +27,13 @@ namespace {
 // We use the generic interface so that unit tests can inject a mock.
 RenderThreadBase* render_thread_ = NULL;
 
+const char* kExtensionName = "chrome/RendererExtensionBindings";
 const char* kExtensionDeps[] = { EventBindings::kName };
 
 class ExtensionImpl : public v8::Extension {
  public:
   ExtensionImpl()
-      : v8::Extension(RendererExtensionBindings::kName,
+      : v8::Extension(kExtensionName,
                       GetStringResource<IDR_RENDERER_EXTENSION_BINDINGS_JS>(),
                       arraysize(kExtensionDeps), kExtensionDeps) {
   }
@@ -75,9 +76,6 @@ class ExtensionImpl : public v8::Extension {
 
 }  // namespace
 
-const char* RendererExtensionBindings::kName =
-    "chrome/RendererExtensionBindings";
-
 v8::Extension* RendererExtensionBindings::Get(RenderThreadBase* render_thread) {
   render_thread_ = render_thread;
   return new ExtensionImpl();
diff --git a/chrome/renderer/extensions/renderer_extension_bindings.h b/chrome/renderer/extensions/renderer_extension_bindings.h
index 3fc1fb4..5ff474e 100755
--- a/chrome/renderer/extensions/renderer_extension_bindings.h
+++ b/chrome/renderer/extensions/renderer_extension_bindings.h
@@ -15,10 +15,6 @@ class RenderThreadBase;
 // used by both web renderers and extension processes.
 class RendererExtensionBindings {
  public:
-  // Name of extension, for dependencies.
-  static const char* kName;
-
-  // Creates an instance of the extension.
   static v8::Extension* Get(RenderThreadBase* render_thread);
 
   // Notify any listeners that a message channel has been opened to this