Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/script_executor.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_SCRIPT_EXECUTOR_H_
 #define CHROME_BROWSER_EXTENSIONS_SCRIPT_EXECUTOR_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/observer_list.h"
 #include "chrome/common/extensions/user_script.h"
 
+class GURL;
+
 namespace base {
 class ListValue;
 }  // namespace base
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 
@@ skipping 17 matching lines @@
     TOP_FRAME,
     ALL_FRAMES,
   };
 
   // The type of world to inject into (main world, or its own isolated world).
   enum WorldType {
     MAIN_WORLD,
     ISOLATED_WORLD,
   };
 
-  // Callback from ExecuteScript. The arguments are (success, page_id, error,
-  // result). page_id is only valid on success, error is only valid on !success.
-  typedef base::Callback<void(bool, int32, const std::string&,
+  // Callback from ExecuteScript. The arguments are (error, on_page_id, on_url,
+  // result). Success is implied by an empty error.

[Jeffrey Yasskin, 2012/08/06 11:39:02]

Probably keep "on_page_id is only valid on success".

+  typedef base::Callback<void(const std::string&, int32, const GURL&,
                               const base::ListValue&)>
       ExecuteScriptCallback;
 
   class Observer {
    public:
     // Automatically observes and unobserves *script_executor on construction
     // and destruction. *script_executor must outlive *this.
     explicit Observer(ScriptExecutor* script_executor);
     virtual ~Observer();
 
     virtual void OnExecuteScriptFinished(const std::string& extension_id,
-                                         bool success,
-                                         int32 page_id,
                                          const std::string& error,
+                                         int32 on_page_id,
+                                         const GURL& on_url,
                                          const base::ListValue&) = 0;
    private:
     ScriptExecutor& script_executor_;
   };
 
   // Executes a script. The arguments match ExtensionMsg_ExecuteCode_Params in
   // extension_messages.h (request_id is populated automatically).
   //
   // |callback| will always be called even if the IPC'd renderer is destroyed
   // before a response is received (in this case the callback will be with a
@@ skipping 20 matching lines @@
 
   // The WebContents this is bound to.
   content::WebContents* web_contents_;
 
   ObserverList<Observer> observer_list_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SCRIPT_EXECUTOR_H_