Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/api/tabs/execute_code_in_tab_function.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/api/tabs/execute_code_in_tab_function.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
@@ skipping 82 matching lines @@
     return false;
   }
 
   scoped_refptr<FileReader> file_reader(new FileReader(
       resource_, base::Bind(&ExecuteCodeInTabFunction::DidLoadFile, this)));
   file_reader->Start();
 
   return true;
 }
 
-void ExecuteCodeInTabFunction::OnExecuteCodeFinished(bool success,
-                                                     int32 page_id,
-                                                     const std::string& error,
+void ExecuteCodeInTabFunction::OnExecuteCodeFinished(const std::string& error,
+                                                     int32 on_page_id,
+                                                     const GURL& on_url,
                                                      const ListValue& result) {
-  if (!error.empty()) {
-    CHECK(!success);
+  if (!error.empty())
     SetError(error);
-  }
 
-  SendResponse(success);
+  SendResponse(error.empty());
 }
 
-void TabsExecuteScriptFunction::OnExecuteCodeFinished(bool success,
-                                                      int32 page_id,
-                                                      const std::string& error,
+void TabsExecuteScriptFunction::OnExecuteCodeFinished(const std::string& error,
+                                                      int32 on_page_id,
+                                                      const GURL& on_url,
                                                       const ListValue& result) {
   if (error.empty())
     SetResult(result.DeepCopy());
-  ExecuteCodeInTabFunction::OnExecuteCodeFinished(success, page_id, error,
+  ExecuteCodeInTabFunction::OnExecuteCodeFinished(error, on_page_id, on_url,
                                                   result);
 }
 
 bool ExecuteCodeInTabFunction::Init() {
   if (details_.get())
     return true;
 
   // |tab_id| is optional so it's ok if it's not there.
   int tab_id = -1;
   args_->GetInteger(0, &tab_id);
@@ skipping 134 matching lines @@
   contents->extension_tab_helper()->script_executor()->ExecuteScript(
       extension->id(),
       script_type,
       code_string,
       frame_scope,
       run_at,
       ScriptExecutor::ISOLATED_WORLD,
       base::Bind(&ExecuteCodeInTabFunction::OnExecuteCodeFinished, this));
   return true;
 }