Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/api/tabs/tabs.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/tabs.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 1329 matching lines @@
   if (!has_callback())
     return;
 
   if (GetExtension()->HasAPIPermission(extensions::APIPermission::kTab)) {
     SetResult(ExtensionTabUtil::CreateTabValue(tab_contents_->web_contents()));
   } else {
     SetResult(Value::CreateNullValue());
   }
 }
 
-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);
+  if (error.empty())
+    PopulateResult();
+  else
     error_ = error;
-  }
-
-  if (success)
-    PopulateResult();
-  SendResponse(success);
+  SendResponse(error.empty());
 }
 
 bool MoveTabsFunction::RunImpl() {
   Value* tab_value = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &tab_value));
 
   std::vector<int> tab_ids;
   EXTENSION_FUNCTION_VALIDATE(extensions::ReadOneOrMoreIntegers(
       tab_value, &tab_ids));
 
@@ skipping 451 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   SetResult(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }