Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/api/tabs/tabs.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__
 #define CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 111 matching lines @@
   virtual ~UpdateTabFunction() {}
   virtual bool UpdateURLIfPresent(base::DictionaryValue* update_props,
                                   int tab_id,
                                   bool* is_async);
   virtual void PopulateResult();
 
   TabContents* tab_contents_;
 
  private:
   virtual bool RunImpl() OVERRIDE;
-  void OnExecuteCodeFinished(bool success,
-                             int32 page_id,
-                             const std::string& error,
+  void OnExecuteCodeFinished(const std::string& error,
+                             int32 on_page_id,
+                             const GURL& on_url,
                              const ListValue& script_result);
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.update")
 };
 class MoveTabsFunction : public SyncExtensionFunction {
   virtual ~MoveTabsFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.move")
 };
 class ReloadTabFunction : public SyncExtensionFunction {
@@ skipping 51 matching lines @@
   // The format (JPEG vs PNG) of the resulting image.  Set in RunImpl().
   ImageFormat image_format_;
 
   // Quality setting to use when encoding jpegs.  Set in RunImpl().
   int image_quality_;
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.captureVisibleTab")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__