Make extensions use a correct same-origin check.

extensions/renderer/programmatic_script_injector.cc

 // Copyright 2014 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 "extensions/renderer/programmatic_script_injector.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/values.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/renderer/injection_host.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
+#include "url/origin.h"
 
 namespace extensions {
 
 ProgrammaticScriptInjector::ProgrammaticScriptInjector(
     const ExtensionMsg_ExecuteCode_Params& params,
     content::RenderFrame* render_frame)
     : params_(new ExtensionMsg_ExecuteCode_Params(params)),
       url_(
           ScriptContext::GetDataSourceURLForFrame(render_frame->GetWebFrame())),
       finished_(false) {
@@ skipping 92 matching lines @@
 
 void ProgrammaticScriptInjector::OnWillNotInject(
     InjectFailureReason reason,
     content::RenderFrame* render_frame) {
   std::string error;
   switch (reason) {
     case NOT_ALLOWED:
       if (url_.SchemeIs(url::kAboutScheme)) {
         error = ErrorUtils::FormatErrorMessage(
             manifest_errors::kCannotAccessAboutUrl, url_.spec(),
-            effective_url_.GetOrigin().spec());
+            url::Origin(effective_url_).Serialize());
       } else {
         // TODO(?) It would be nice to show kCannotAccessPageWithUrl here if
         // this is triggered by an extension with tabs permission. See
         // https://codereview.chromium.org/1414223005/diff/1/extensions/
         // common/manifest_constants.cc#newcode269
         error = manifest_errors::kCannotAccessPage;
       }
       break;
     case EXTENSION_REMOVED:  // no special error here.
     case WONT_INJECT:
@@ skipping 16 matching lines @@
   // frame deletions so nothing is left hanging).
   if (render_frame) {
     render_frame->Send(
         new ExtensionHostMsg_ExecuteCodeFinished(
             render_frame->GetRoutingID(), params_->request_id,
             error, url_, results_));
   }
 }
 
 }  // namespace extensions