Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

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

Index: chrome/browser/extensions/api/tabs/tabs.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 73749424f4cd4381b1edeec9df148fb692417f45..2e069b65cb5a57a4be5c3006c086785fe7444e8b 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -1347,18 +1347,15 @@ void UpdateTabFunction::PopulateResult() {
   }
 }
 
-void UpdateTabFunction::OnExecuteCodeFinished(bool success,
-                                              int32 page_id,
-                                              const std::string& error,
+void UpdateTabFunction::OnExecuteCodeFinished(const std::string& error,
+                                              int32 on_page_id,
+                                              const GURL& url,
                                               const ListValue& script_result) {
-  if (!error.empty()) {
-    CHECK(!success);
-    error_ = error;
-  }
-
-  if (success)
+  if (error.empty())
     PopulateResult();
-  SendResponse(success);
+  else
+    error_ = error;
+  SendResponse(error.empty());
 }
 
 bool MoveTabsFunction::RunImpl() {