Reland r55382. When blocking cookies, also show an icon in the location bar when cookies are accessed.

If the user choses to block cookies per default, this will grant access to the collected cookies dialog as soon as the page accesses cookies. Right now, the icon is only shown if cookies were actually blocked.

BUG=45230
TEST=Canned*.*:ContentSettingImage*.*:TabSpecific*.*

Review URL: http://codereview.chromium.org/3014056

Review URL: http://codereview.chromium.org/3148002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55548 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 0 deletions

diff --git a/chrome/browser/browsing_data_database_helper_unittest.cc b/chrome/browser/browsing_data_database_helper_unittest.cc
index b5368c4..9d313db 100644
--- a/chrome/browser/browsing_data_database_helper_unittest.cc
+++ b/chrome/browser/browsing_data_database_helper_unittest.cc
@@ -93,3 +93,19 @@ TEST(CannedBrowsingDataDatabaseTest, Unique) {
   EXPECT_STREQ(origin_str, result[0].origin_identifier.c_str());
   EXPECT_STREQ(db, result[0].database_name.c_str());
 }
+
+TEST(CannedBrowsingDataDatabaseTest, Empty) {
+  TestingProfile profile;
+
+  const GURL origin("http://host1:1/");
+  const char db[] = "db1";
+
+  scoped_refptr<CannedBrowsingDataDatabaseHelper> helper =
+      new CannedBrowsingDataDatabaseHelper(&profile);
+
+  ASSERT_TRUE(helper->empty());
+  helper->AddDatabase(origin, db, "");
+  ASSERT_FALSE(helper->empty());
+  helper->Reset();
+  ASSERT_TRUE(helper->empty());
+}