rebase and more minor changes.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13410 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 6605f4e..b4fc6d5 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -3031,8 +3031,8 @@
   if (!web_frame)
     return;  // The frame went away.
 
-  extensions_v8::ExtensionProcessBindings::ExecuteCallbackInFrame(
-      web_frame, callback_id, response);
+  ExtensionProcessBindings::ExecuteCallbackInFrame(web_frame, callback_id,
+                                                   response);
   pending_extension_callbacks_.Remove(callback_id);
 }