When deleting storage through the cookies tree model, also update its cache

chrome/browser/browsing_data_database_helper_browsertest.cc

 // Copyright (c) 2011 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 "base/file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_helper_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 41 matching lines @@
 // Called back by BrowsingDataDatabaseHelper on the UI thread once the database
 // information has been retrieved.
 class StopTestOnCallback {
  public:
   explicit StopTestOnCallback(
       BrowsingDataDatabaseHelper* database_helper)
       : database_helper_(database_helper) {
     DCHECK(database_helper_);
   }
 
-  void Callback(const std::vector<BrowsingDataDatabaseHelper::DatabaseInfo>&
+  void Callback(const std::list<BrowsingDataDatabaseHelper::DatabaseInfo>&
                 database_info_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     ASSERT_EQ(1UL, database_info_list.size());
     EXPECT_EQ(std::string(kTestIdentifier1),
-              database_info_list.at(0).origin_identifier);
+              database_info_list.begin()->origin_identifier);
     MessageLoop::current()->Quit();
   }
 
  private:
   BrowsingDataDatabaseHelper* database_helper_;
 };
 
 // Flaky on Win/Mac/Linux: http://crbug.com/92460
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
   CreateDatabases();
@@ skipping 18 matching lines @@
   scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
       new CannedBrowsingDataDatabaseHelper(browser()->profile()));
   helper->AddDatabase(origin1, db1, "");
   helper->AddDatabase(origin1, db2, "");
   helper->AddDatabase(origin2, db3, "");
 
   TestCompletionCallback callback;
   helper->StartFetching(
       NewCallback(&callback, &TestCompletionCallback::callback));
 
-  std::vector<BrowsingDataDatabaseHelper::DatabaseInfo> result =
+  std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(3u, result.size());
-  EXPECT_STREQ(origin_str1, result[0].origin_identifier.c_str());
-  EXPECT_STREQ(db1, result[0].database_name.c_str());
-  EXPECT_STREQ(origin_str1, result[1].origin_identifier.c_str());
-  EXPECT_STREQ(db2, result[1].database_name.c_str());
-  EXPECT_STREQ(origin_str2, result[2].origin_identifier.c_str());
-  EXPECT_STREQ(db3, result[2].database_name.c_str());
+  std::list<BrowsingDataDatabaseHelper::DatabaseInfo>::iterator info =
+      result.begin();
+  EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
+  EXPECT_STREQ(db1, info->database_name.c_str());
+  info++;
+  EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
+  EXPECT_STREQ(db2, info->database_name.c_str());
+  info++;
+  EXPECT_STREQ(origin_str2, info->origin_identifier.c_str());
+  EXPECT_STREQ(db3, info->database_name.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedUnique) {
   const GURL origin("http://host1:1/");
   const char origin_str[] = "http_host1_1";
   const char db[] = "db1";
 
   scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
       new CannedBrowsingDataDatabaseHelper(browser()->profile()));
   helper->AddDatabase(origin, db, "");
   helper->AddDatabase(origin, db, "");
 
   TestCompletionCallback callback;
   helper->StartFetching(
       NewCallback(&callback, &TestCompletionCallback::callback));
 
-  std::vector<BrowsingDataDatabaseHelper::DatabaseInfo> result =
+  std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
-  EXPECT_STREQ(origin_str, result[0].origin_identifier.c_str());
-  EXPECT_STREQ(db, result[0].database_name.c_str());
+  EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str());
+  EXPECT_STREQ(db, result.begin()->database_name.c_str());
 }
 }  // namespace