Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/api/tabs/execute_code_in_tab_function.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
 #define CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
 
 #include <string>
 
 #include "chrome/browser/extensions/extension_function.h"
@@ skipping 14 matching lines @@
   ExecuteCodeInTabFunction();
 
  protected:
   virtual ~ExecuteCodeInTabFunction();
 
   // ExtensionFunction:
   virtual bool HasPermission() OVERRIDE;
   virtual bool RunImpl() OVERRIDE;
 
   // Message handler.
-  virtual void OnExecuteCodeFinished(bool success,
-                                     int32 page_id,
-                                     const std::string& error,
+  virtual void OnExecuteCodeFinished(const std::string& error,
+                                     int32 on_page_id,
+                                     const GURL& on_url,
                                      const ListValue& script_result);
 
  private:
   // Initialize the |execute_tab_id_| and |details_| if they haven't already
   // been. Returns whether initialization was successful.
   bool Init();
 
   // Called when contents from the file whose path is specified in JSON
   // arguments has been loaded.
   void DidLoadFile(bool success, const std::string& data);
@@ skipping 21 matching lines @@
 
   // Contains extension resource built from path of file which is
   // specified in JSON arguments.
   ExtensionResource resource_;
 };
 
 class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
  private:
   virtual ~TabsExecuteScriptFunction() {}
 
-  virtual void OnExecuteCodeFinished(bool success, int32 page_id,
-                                     const std::string& error,
+  virtual void OnExecuteCodeFinished(const std::string& error,
+                                     int32 on_page_id,
+                                     const GURL& on_url,
                                      const ListValue& script_result) OVERRIDE;
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.executeScript")
 };
 
 class TabsInsertCSSFunction : public ExecuteCodeInTabFunction {
  private:
   virtual ~TabsInsertCSSFunction() {}
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.insertCSS")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__