Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/common/extensions/extension_messages.h

 // 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.
 
 // IPC messages for extensions.
 // Multiply-included message file, hence no include guard.
 
 #include "base/shared_memory.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/view_type.h"
 #include "chrome/common/web_apps.h"
 #include "content/public/common/common_param_traits.h"
+#include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
 #define IPC_MESSAGE_START ExtensionMsgStart
 
 IPC_ENUM_TRAITS(chrome::ViewType)
 
 // Parameters structure for ExtensionHostMsg_Request.
 IPC_STRUCT_BEGIN(ExtensionHostMsg_Request_Params)
   // Message name.
   IPC_STRUCT_MEMBER(std::string, name)
@@ skipping 397 matching lines @@
                      bool /* connection_error */)
 
 // Used to get the extension message bundle.
 IPC_SYNC_MESSAGE_CONTROL1_1(ExtensionHostMsg_GetMessageBundle,
                             std::string /* extension id */,
                             SubstitutionMap /* message bundle */)
 
 // 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 */,
+                    std::string /* error; empty implies success */,
                     int32 /* page_id the code executed on, if successful */,
-                    std::string /* error message, if unsuccessful */,
+                    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 */,
                     WebApplicationInfo)
 
 // Sent by the renderer to implement chrome.app.install().
 IPC_MESSAGE_ROUTED1(ExtensionHostMsg_InstallApplication,
                     WebApplicationInfo)
 
 // Sent by the renderer to implement chrome.webstore.install().
@@ skipping 39 matching lines @@
 // alive.
 IPC_MESSAGE_ROUTED0(ExtensionHostMsg_DecrementLazyKeepaliveCount)
 
 // Fetches a globally unique ID (for the lifetime of the browser) from the
 // browser process.
 IPC_SYNC_MESSAGE_CONTROL0_1(ExtensionHostMsg_GenerateUniqueID,
                             int /* unique_id */)
 
 // Resumes resource requests for a newly created app window.
 IPC_MESSAGE_CONTROL1(ExtensionHostMsg_ResumeRequests, int /* route_id */)