Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/script_executor.cc

 // 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.
 
 #include "chrome/browser/extensions/script_executor.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ skipping 48 matching lines @@
 
     IPC_BEGIN_MESSAGE_MAP(Handler, message)
       IPC_MESSAGE_HANDLER(ExtensionHostMsg_ExecuteCodeFinished,
                           OnExecuteCodeFinished)
     IPC_END_MESSAGE_MAP()
     return true;
   }
 
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE {
     base::ListValue val;
-    callback_.Run(false, -1, kRendererDestroyed, val);
+    callback_.Run(kRendererDestroyed, -1, GURL(""), val);
     delete this;
   }
 
  private:
   void OnExecuteCodeFinished(int request_id,
-                             bool success,
-                             int32 page_id,
                              const std::string& error,
+                             int32 on_page_id,
+                             const GURL& on_url,
                              const base::ListValue& script_result) {
     if (observer_list_) {
       FOR_EACH_OBSERVER(ScriptExecutor::Observer, *observer_list_,
-                        OnExecuteScriptFinished(extension_id_, success,
-                                                page_id, error, script_result));
+                        OnExecuteScriptFinished(extension_id_, error,
+                                                on_page_id, on_url,
+                                                script_result));
     }
 
-    callback_.Run(success, page_id, error, script_result);
+    callback_.Run(error, on_page_id, on_url, script_result);
     delete this;
   }
 
   base::WeakPtr<ObserverList<ScriptExecutor::Observer> > observer_list_;
   std::string extension_id_;
   int request_id_;
   ScriptExecutor::ExecuteScriptCallback callback_;
 };
 
 }  // namespace
@@ skipping 28 matching lines @@
   params.code = code;
   params.all_frames = (frame_scope == ALL_FRAMES);
   params.run_at = static_cast<int>(run_at);
   params.in_main_world = (world_type == MAIN_WORLD);
 
   // Handler handles IPCs and deletes itself on completion.
   new Handler(&observer_list_, web_contents_, params, callback);
 }
 
 }  // namespace extensions