Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/history/android/android_provider_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/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 529 matching lines @@
   std::vector<string16> args;
   int deleted_count = 0;
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("Favicon IS NULL", args,
                                                  &deleted_count));
   EXPECT_EQ(1, deleted_count);
   // Verify notifications
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
+  EXPECT_EQ(1u, delegate_.deleted_details()->urls.size());
+  EXPECT_TRUE(delegate_.deleted_details()->urls.end() !=
+              delegate_.deleted_details()->urls.find(row1.url()));
   EXPECT_EQ(row1.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row1.title(),
             delegate_.deleted_details()->rows[0].title());
   EXPECT_FALSE(delegate_.favicon_details());
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
@@ skipping 27 matching lines @@
 
   deleted_count = 0;
   // Delete row2.
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("bookmark = 0",
                   std::vector<string16>(), &deleted_count));
   // Verify notifications
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
+  EXPECT_EQ(1u, delegate_.deleted_details()->urls.size());
+  EXPECT_TRUE(delegate_.deleted_details()->urls.end() !=
+              delegate_.deleted_details()->urls.find(row2.url()));
   EXPECT_EQ(row2.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row2.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row2.title(),
             delegate_.deleted_details()->rows[0].title());
   ASSERT_TRUE(delegate_.favicon_details());
   ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row2.url()));
 
@@ skipping 135 matching lines @@
 
   // Only update one URL.
   update_args.clear();
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications, Update involves insert and delete URLS.
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
+  EXPECT_EQ(1u, delegate_.deleted_details()->urls.size());
+  EXPECT_TRUE(delegate_.deleted_details()->urls.end() !=
+              delegate_.deleted_details()->urls.find(row1.url()));
   EXPECT_EQ(row1.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row1.title(),
             delegate_.deleted_details()->rows[0].title());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(update_row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(row1.last_visit_time()),
@@ skipping 32 matching lines @@
   update_row2.set_visit_count(10);
 
   update_args.clear();
   update_args.push_back(UTF8ToUTF16(row2.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row2, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications, Update involves insert and delete URLS.
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
+  EXPECT_EQ(1u, delegate_.deleted_details()->urls.size());
+  EXPECT_TRUE(delegate_.deleted_details()->urls.end() !=
+              delegate_.deleted_details()->urls.find(row2.url()));
   EXPECT_EQ(row2.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row2.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row2.title(),
             delegate_.deleted_details()->rows[0].title());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(update_row2.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(update_row2.last_visit_time()),
@@ skipping 663 matching lines @@
   // Still find the row1.
   URLRow url_row;
   ASSERT_TRUE(history_db_.GetRowForURL(row1.url(), &url_row));
   // The visit_count was reset.
   EXPECT_EQ(0, url_row.visit_count());
   EXPECT_EQ(Time::UnixEpoch(), url_row.last_visit());
 
   // Verify notification
   ASSERT_TRUE(delegate_.deleted_details());
   ASSERT_EQ(2u, delegate_.deleted_details()->rows.size());
+  ASSERT_EQ(2u, delegate_.deleted_details()->urls.size());
+  ASSERT_TRUE(delegate_.modified_details());
+  ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(Time::UnixEpoch(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(1u, delegate_.favicon_details()->urls.size());
 }
 
 }  // namespace history