Also register read cookies in the content settings delegate.

chrome/browser/tab_contents/tab_specific_content_settings.cc

 // Copyright (c) 2010 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/tab_contents/tab_specific_content_settings.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
@@ skipping 75 matching lines @@
 void TabSpecificContentSettings::OnContentAccessed(ContentSettingsType type) {
   DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION)
       << "Geolocation settings handled by OnGeolocationPermissionSet";
   if (!content_accessed_[type]) {
     content_accessed_[type] = true;
     if (delegate_)
       delegate_->OnContentSettingsAccessed(false);
   }
 }
 
+void TabSpecificContentSettings::OnCookiesRead(
+    const GURL& url,
+    net::CookieMonster* cookie_monster,
+    const net::CookieOptions& options,
+    bool blocked_by_policy) {
+  LocalSharedObjectsContainer& container = blocked_by_policy ?
+      blocked_local_shared_objects_ : allowed_local_shared_objects_;
+  net::CookieMonster::CookieList cookie_list =
+    cookie_monster->GetAllCookiesForURLWithOptions(url, options);

[darin (slow to review), 2010/11/30 18:24:11]

nit: indent by 4 spaces

[darin (slow to review), 2010/11/30 18:24:11]

it seems like the cookies that you fetch here could be different than the ones
that were read.  something else could have happened on the IO thread that could
have mutated the cookie monster.  perhaps you should collect the cookies on the
IO thread to avoid this race condition.

[jochen (gone - plz use gerrit), 2010/12/03 16:02:32]

Done.

+  typedef net::CookieMonster::CookieList::const_iterator cookie_iterator;
+  for (cookie_iterator cookie = cookie_list.begin();
+       cookie != cookie_list.end(); ++cookie) {
+    container.cookies()->SetCookieWithDetails(url,
+                                              cookie->Name(),
+                                              cookie->Value(),
+                                              cookie->Domain(),
+                                              cookie->Path(),
+                                              cookie->ExpiryDate(),
+                                              cookie->IsSecure(),
+                                              cookie->IsHttpOnly());
+  }
+  if (blocked_by_policy)
+    OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string());
+  else
+    OnContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES);
+}
+
 void TabSpecificContentSettings::OnCookieAccessed(
     const GURL& url,
     const std::string& cookie_line,
     const net::CookieOptions& options,
     bool blocked_by_policy) {
   if (blocked_by_policy) {
     blocked_local_shared_objects_.cookies()->SetCookieWithOptions(
         url, cookie_line, options);
     OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string());
   } else {
@@ skipping 154 matching lines @@
 
 CookiesTreeModel*
 TabSpecificContentSettings::LocalSharedObjectsContainer::GetCookiesTreeModel() {
   return new CookiesTreeModel(cookies_,
                               databases_,
                               local_storages_,
                               session_storages_,
                               appcaches_,
                               indexed_dbs_);
 }