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..53e67178d072ebc7958ef8fce825ba6bb85597c1 100644
--- a/chrome/renderer/extensions/user_script_scheduler.cc
+++ b/chrome/renderer/extensions/user_script_scheduler.cc
@@ -145,7 +145,11 @@ 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,
+        "",  // no error
+        -1,
+        GURL(""),
         execution_results));
     return;
   }
@@ -179,11 +183,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 +236,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));
 }