Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc

Index: chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
diff --git a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
index 1fe587ea6cbb99407aab4285790a9a6a1dd63ee0..1d9d4079fe0d5d7fb82a06c9aa80b80f908710f3 100644
--- a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
@@ -100,25 +100,23 @@ bool ExecuteCodeInTabFunction::RunImpl() {
   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);
 }