Formalise a CHECK for the NULL NavigationEntry in ScriptBadgeController, and

chrome/browser/extensions/script_badge_controller_unittest.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 <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 102 matching lines @@
       &location_bar_updated,
       chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
       content::Source<Profile>(tab_contents()->profile()));
 
   // Initially, no script badges.
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
               testing::ElementsAre());
 
   ListValue val;
   script_badge_controller_->OnExecuteScriptFinished(
-      extension->id(), true,
+      extension->id(),
+      "",  // no error
       tab_contents()->web_contents()->GetController().GetActiveEntry()->
       GetPageID(),
-      "",
+      GURL(""),
       val);
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
               testing::ElementsAre(extension->script_badge()));
   EXPECT_THAT(location_bar_updated.events, testing::Gt(0));
 };
 
 TEST_F(ScriptBadgeControllerTest, FragmentNavigation) {
   scoped_refptr<const Extension> extension = AddTestExtension();
 
   // Establish a page id.
   NavigateAndCommit(GURL("http://www.google.com"));
 
   // Run script. Should be a notification and a script badge.
   {
     content::NotificationRegistrar notification_registrar;
     CountingNotificationObserver location_bar_updated;
     notification_registrar.Add(
         &location_bar_updated,
         chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
         content::Source<Profile>(tab_contents()->profile()));
 
     ListValue val;
     script_badge_controller_->OnExecuteScriptFinished(
-        extension->id(), true,
+        extension->id(),
+        "",  // no error
         tab_contents()->web_contents()->GetController().GetActiveEntry()->
             GetPageID(),
-        "",
+        GURL(""),
         val);
 
     EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
                 testing::ElementsAre(extension->script_badge()));
     EXPECT_EQ(1, location_bar_updated.events);
   }
 
   // Navigate to a hash fragment. Shouldn't change.
   {
     content::NotificationRegistrar notification_registrar;
@@ skipping 70 matching lines @@
   // Getting attention a second time should have no effect.
   script_badge_controller_->GetAttentionFor(extension->id());
 
   EXPECT_THAT(script_badge_controller_->GetCurrentActions(),
               testing::ElementsAre(extension->script_badge()));
   EXPECT_EQ(0, subsequent_get_attention_call.events);
 };
 
 }  // namespace
 }  // namespace extensions