Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

chrome/renderer/extensions/schema_generated_bindings.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/extensions/schema_generated_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "grit/common_resources.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlob.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "v8/include/v8.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::V8ValueConverter;
 using extensions::ExtensionAPI;
 using WebKit::WebFrame;
+using WebKit::WebSecurityOrigin;
 using WebKit::WebView;
 
 namespace {
 
 const char* kExtensionDeps[] = {
   "extensions/event.js",
   "extensions/json_schema.js",
   "extensions/miscellaneous_bindings.js",
   "extensions/apitest.js"
 };
@@ skipping 426 matching lines @@
         v8_extension->extension_dispatcher_->function_names();
     if (function_names.find(name) == function_names.end()) {
       NOTREACHED() << "Unexpected function " << name;
       return v8::Undefined();
     }
 
     if (!v8_extension->CheckCurrentContextAccessToExtensionAPI(name))
       return v8::Undefined();
 
     GURL source_url;
+    WebSecurityOrigin origin;
     WebFrame* webframe = current_context->web_frame();
-    if (webframe)
+    if (webframe) {
       source_url = webframe->document().url();
+      origin = webframe->document().securityOrigin();
+    }
 
     int request_id = args[2]->Int32Value();
     bool has_callback = args[3]->BooleanValue();
     bool for_io_thread = args[4]->BooleanValue();
 
     v8::Persistent<v8::Context> v8_context =
         v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
     DCHECK(!v8_context.IsEmpty());
     g_pending_requests.Get()[request_id].reset(new PendingRequest(
         v8_context, name, current_context->extension_id()));
 
     ExtensionHostMsg_Request_Params params;
     params.name = name;
     params.arguments.Swap(value_args);
     params.extension_id = current_context->extension_id();
     params.source_url = source_url;
+    params.origin = origin.toString();

[Aaron Boodman, 2011/12/09 16:05:20]

Can you call this source_origin for clarity?

[Yoyo Zhou, 2011/12/09 19:59:09]

Done.

     params.request_id = request_id;
     params.has_callback = has_callback;
     params.user_gesture =
         webframe ? webframe->isProcessingUserGesture() : false;
     if (for_io_thread) {
       renderview->Send(new ExtensionHostMsg_RequestForIOThread(
           renderview->GetRoutingId(), params));
     } else {
       renderview->Send(new ExtensionHostMsg_Request(
           renderview->GetRoutingId(), params));
@@ skipping 170 matching lines @@
     const std::string& extension_id) {
   for (PendingRequestMap::const_iterator it = g_pending_requests.Get().begin();
        it != g_pending_requests.Get().end(); ++it) {
     if (it->second->extension_id == extension_id)
       return true;
   }
   return false;
 }
 
 }  // namespace