Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/renderer/extensions/user_script_scheduler.cc

Index: chrome/renderer/extensions/user_script_scheduler.cc
diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc
index 5ad107c028e3adae59bd5854ded218321ad0fd61..2c013e59177e324779dc159b70bcfc5084051722 100644
--- a/chrome/renderer/extensions/user_script_scheduler.cc
+++ b/chrome/renderer/extensions/user_script_scheduler.cc
@@ -145,7 +145,7 @@ void UserScriptScheduler::ExecuteCodeImpl(
   // 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;
   }
@@ -179,11 +179,11 @@ void UserScriptScheduler::ExecuteCodeImpl(
           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;
         }
@@ -232,9 +232,9 @@ void UserScriptScheduler::ExecuteCodeImpl(
   render_view->Send(new ExtensionHostMsg_ExecuteCodeFinished(
       render_view->GetRoutingID(),
       params.request_id,
-      true,
+      "",  // no error
       render_view->GetPageId(),
-      "",
+      UserScriptSlave::GetDataSourceURLForFrame(frame_),
       execution_results));
 }