Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/renderer/extensions/user_script_scheduler.cc

 // 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.
 
 #include "chrome/renderer/extensions/user_script_scheduler.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ skipping 127 matching lines @@
       params.extension_id);
   content::RenderView* render_view =
       content::RenderView::FromWebView(frame_->view());
   ExtensionHelper* extension_helper = ExtensionHelper::Get(render_view);
   base::ListValue execution_results;
 
   // Since extension info is sent separately from user script info, they can
   // be out of sync. We just ignore this situation.
   if (!extension) {
     render_view->Send(new ExtensionHostMsg_ExecuteCodeFinished(
-        render_view->GetRoutingID(), params.request_id, true, -1, "",
+        render_view->GetRoutingID(), params.request_id, "", -1, GURL(""),

[Aaron Boodman, 2012/08/07 02:08:54]

This is kinda a weird response. Looks like half-successful (no error message)
and half failure (no URL-operated-on). Will this mess anything up on the browser
side?

[not at google - send to devlin, 2012/08/07 02:16:23]

It was equivalently weird before; success (true) but no page ID (-1). But
shouldn't mess anything up on the browser side, no... the URL won't be valid but
callers should be checking the error, not the URL... and since I Just had to
update all call sides, pretty sure that this is what happens.

         execution_results));
     return;
   }
 
   std::vector<WebFrame*> frame_vector;
   frame_vector.push_back(frame_);
   if (params.all_frames)
     GetAllChildFrames(frame_, &frame_vector);
 
   for (std::vector<WebFrame*>::iterator frame_it = frame_vector.begin();
@@ skipping 13 matching lines @@
       if (!extension->CanExecuteScriptOnPage(frame->document().url(),
                                              extension_helper->tab_id(),
                                              NULL,
                                              NULL)) {
         if (frame->parent()) {
           continue;
         } else {
           render_view->Send(new ExtensionHostMsg_ExecuteCodeFinished(
               render_view->GetRoutingID(),
               params.request_id,
-              false,
-              -1,
               ExtensionErrorUtils::FormatErrorMessage(
                   extension_manifest_errors::kCannotAccessPage,
                   frame->document().url().spec()),
+              -1,
+              GURL(""),
               execution_results));
           return;
         }
       }
 
       WebScriptSource source(WebString::fromUTF8(params.code));
       v8::HandleScope scope;
       v8::Persistent<v8::Context> persistent_context = v8::Context::New();
       v8::Local<v8::Context> context =
           v8::Local<v8::Context>::New(persistent_context);
@@ skipping 28 matching lines @@
       frame->document().insertUserStyleSheet(
           WebString::fromUTF8(params.code),
           // Author level is consistent with WebView::addUserStyleSheet.
           WebDocument::UserStyleAuthorLevel);
     }
   }
 
   render_view->Send(new ExtensionHostMsg_ExecuteCodeFinished(
       render_view->GetRoutingID(),
       params.request_id,
-      true,
+      "",  // no error
       render_view->GetPageId(),
-      "",
+      UserScriptSlave::GetDataSourceURLForFrame(frame_),
       execution_results));
 }
 
 bool UserScriptScheduler::GetAllChildFrames(
     WebFrame* parent_frame,
     std::vector<WebFrame*>* frames_vector) const {
   if (!parent_frame)
     return false;
 
   for (WebFrame* child_frame = parent_frame->firstChild(); child_frame;
        child_frame = child_frame->nextSibling()) {
     frames_vector->push_back(child_frame);
     GetAllChildFrames(child_frame, frames_vector);
   }
   return true;
 }
 
 }  // namespace extensions