In ScriptBadgeController, don't CHECK for a valid page ID if there was an error,

chrome/browser/extensions/script_badge_controller.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/script_badge_controller.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/browser_event_router.h"
@@ skipping 93 matching lines @@
 
   return ACTION_NONE;
 }
 
 void ScriptBadgeController::OnExecuteScriptFinished(
     const std::string& extension_id,
     const std::string& error,
     int32 on_page_id,
     const GURL& on_url,
     const base::ListValue& script_results) {
+  if (!error.empty())
+    return;
+
   int32 current_page_id = GetPageID();
 
-  // Tracking down http://crbug.com/138323.
-  if (current_page_id < 0) {
+  if (on_page_id == current_page_id) {
+    if (MarkExtensionExecuting(extension_id))
+      NotifyChange();
+  } else if (current_page_id < 0) {
+    // Tracking down http://crbug.com/138323.
     std::string message = base::StringPrintf(
-        "Expected a page ID of %d on URL \"%s\", but there was no navigation "
-        "entry. Current URL is \"%s\", extension ID is %s.",
+        "Expected a page ID of %d but there was no navigation entry. "
+        "Extension ID is %s.",
         on_page_id,
-        on_url.spec().c_str(),
-        tab_contents_->web_contents()->GetURL().spec().c_str(),
         extension_id.c_str());
     char buf[1024];
     base::snprintf(buf, arraysize(buf), "%s", message.c_str());
     CHECK(false) << message;
   }
-
-  if (error.empty() && on_page_id == current_page_id) {
-    if (MarkExtensionExecuting(extension_id))
-      NotifyChange();
-  }
 }
 
 ExtensionService* ScriptBadgeController::GetExtensionService() {
   return extensions::ExtensionSystem::Get(
       tab_contents_->profile())->extension_service();
 }
 
 int32 ScriptBadgeController::GetPageID() {
   content::NavigationEntry* nav_entry =
       tab_contents_->web_contents()->GetController().GetActiveEntry();
@@ skipping 42 matching lines @@
   std::vector<std::string> as_vector(ids.begin(), ids.end());
   return "[" + JoinString(as_vector, ',') + "]";
 }
 }  // namespace
 
 void ScriptBadgeController::OnContentScriptsExecuting(
     const std::set<std::string>& extension_ids,
     int32 on_page_id,
     const GURL& on_url) {
   int32 current_page_id = GetPageID();
+  if (on_page_id != current_page_id)
+    return;
 
-  // Tracking down http://crbug.com/138323.
   if (current_page_id < 0) {
+    // Tracking down http://crbug.com/138323.
     std::string message = base::StringPrintf(
-        "Expected a page ID of %d on URL \"%s\", but there was no navigation "
-        "entry. Current URL is \"%s\", extension IDs are %s.",
+        "Expected a page ID of %d but there was no navigation entry. "
+        "Extension IDs are %s.",
         on_page_id,
-        on_url.spec().c_str(),
-        tab_contents_->web_contents()->GetURL().spec().c_str(),
         JoinExtensionIDs(extension_ids).c_str());
     char buf[1024];
     base::snprintf(buf, arraysize(buf), "%s", message.c_str());
     CHECK(false) << message;
   }
 
-  if (on_page_id != current_page_id)
-    return;
-
   bool changed = false;
   for (std::set<std::string>::const_iterator it = extension_ids.begin();
        it != extension_ids.end(); ++it) {
     changed |= MarkExtensionExecuting(*it);
   }
   if (changed)
     NotifyChange();
 }
 
 ExtensionAction* ScriptBadgeController::AddExtensionToCurrentActions(
@@ skipping 43 matching lines @@
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions