Make NOTIFICATION_HISTORY_URLS_MODIFIED fired consistently for both typed and non-typed URLs

chrome/browser/history/history_backend_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 "chrome/browser/history/history_backend.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 926 matching lines @@
   backend_->AddPagesWithDetails(rows, history::SOURCE_BROWSED);
 
   // Verify that recent URLs have ended up in the main |db_|, while the already
   // expired URL has been ignored.
   URLRow stored_row1, stored_row2, stored_row3, stored_row4;
   EXPECT_NE(0, backend_->db_->GetRowForURL(row1.url(), &stored_row1));
   EXPECT_NE(0, backend_->db_->GetRowForURL(row2.url(), &stored_row2));
   EXPECT_NE(0, backend_->db_->GetRowForURL(row3.url(), &stored_row3));
   EXPECT_EQ(0, backend_->db_->GetRowForURL(row4.url(), &stored_row4));
 
-  // Ensure that a notification was fired, and further verify that the IDs in
-  // the notification are set to those that are in effect in the main database.
-  // The InMemoryHistoryBackend relies on this for caching.
+  // Ensure that a notification was fired for both typed and non-typed URLs.
+  // Further verify that the IDs in the notification are set to those that are
+  // in effect in the main database. The InMemoryHistoryBackend relies on this
+  // for caching.
   ASSERT_EQ(1u, broadcasted_notifications().size());
   ASSERT_EQ(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
             broadcasted_notifications()[0].first);
   const URLsModifiedDetails* details = static_cast<const URLsModifiedDetails*>(
       broadcasted_notifications()[0].second);
-  EXPECT_EQ(2u, details->changed_urls.size());
+  EXPECT_EQ(3u, details->changed_urls.size());
+
+  URLRows::const_iterator it_row1 = std::find_if(
+      details->changed_urls.begin(),
+      details->changed_urls.end(),
+      history::URLRow::URLRowHasURL(row1.url()));
+  ASSERT_NE(details->changed_urls.end(), it_row1);
+  EXPECT_EQ(stored_row1.id(), it_row1->id());
 
   URLRows::const_iterator it_row2 = std::find_if(
-      details->changed_urls.begin(),
-      details->changed_urls.end(),
-      history::URLRow::URLRowHasURL(row2.url()));
+        details->changed_urls.begin(),
+        details->changed_urls.end(),
+        history::URLRow::URLRowHasURL(row2.url()));
   ASSERT_NE(details->changed_urls.end(), it_row2);
   EXPECT_EQ(stored_row2.id(), it_row2->id());
 
   URLRows::const_iterator it_row3 = std::find_if(
         details->changed_urls.begin(),
         details->changed_urls.end(),
         history::URLRow::URLRowHasURL(row3.url()));
   ASSERT_NE(details->changed_urls.end(), it_row3);
   EXPECT_EQ(stored_row3.id(), it_row3->id());
 }
@@ skipping 2380 matching lines @@
   // Verify that the second term is no longer returned as result, and also check
   // at the low level that it is gone for good. The term corresponding to the
   // first URLRow should not be affected.
   EXPECT_EQ(1u, GetNumberOfMatchingSearchTerms(kTestKeywordId, term1));
   EXPECT_EQ(0u, GetNumberOfMatchingSearchTerms(kTestKeywordId, term2));
   EXPECT_TRUE(mem_backend_->db()->GetKeywordSearchTermRow(row1.id(), NULL));
   EXPECT_FALSE(mem_backend_->db()->GetKeywordSearchTermRow(row2.id(), NULL));
 }
 
 }  // namespace history