Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/common/extensions/extension_messages.h

Index: chrome/common/extensions/extension_messages.h
diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h
index a7fd594cc654f2da8cbd220b5aafe650a11b925d..135aec8e9466f0cb62d61a3143da5e902e66dcf5 100644
--- a/chrome/common/extensions/extension_messages.h
+++ b/chrome/common/extensions/extension_messages.h
@@ -15,6 +15,7 @@
 #include "chrome/common/web_apps.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
+#include "googleurl/src/gurl.h"
 
 #define IPC_MESSAGE_START ExtensionMsgStart
 
@@ -430,20 +431,21 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ExtensionHostMsg_GetMessageBundle,
 
 // Sent from the renderer to the browser to return the script running result.
 IPC_MESSAGE_ROUTED5(ExtensionHostMsg_ExecuteCodeFinished,
-                    int /* request id */,
-                    bool /* whether the script ran successfully */,
-                    int32 /* page_id the code executed on, if successful */,
-                    std::string /* error message, if unsuccessful */,
-                    ListValue /* result of the script */)
+                   int /* request id */,
+                   std::string /* error; empty implies success */,
+                   int32 /* page_id the code executed on, if successful */,
+                   GURL /* URL of the code executed on, if successful */,
+                   ListValue /* result of the script */)
 
 // Sent from the renderer to the browser to notify that content scripts are
 // running in the renderer that the IPC originated from.
 // Note that the page_id is for the parent (or more accurately the topmost)
 // frame (e.g. if executing in an iframe this is the page ID of the parent,
 // unless the parent is an iframe... etc).
-IPC_MESSAGE_ROUTED2(ExtensionHostMsg_ContentScriptsExecuting,
+IPC_MESSAGE_ROUTED3(ExtensionHostMsg_ContentScriptsExecuting,
                     std::set<std::string> /* extensions that have scripts */,
-                    int32 /* page_id of the _topmost_ frame */)
+                    int32 /* page_id of the _topmost_ frame */,
+                    GURL /* url of the _topmost_ frame */)
 
 IPC_MESSAGE_ROUTED2(ExtensionHostMsg_DidGetApplicationInfo,
                     int32 /* page_id */,