diff options
| author | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:00:45 +0000 |
|---|---|---|
| committer | rdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-31 19:00:45 +0000 |
| commit | c4bc58d55fb1b29f69fc1bccc93b74e56c99b010 (patch) | |
| tree | 050f9beae20aabd6e9846eb04a0066ddfe54b3fb /chrome/browser/tab_contents | |
| parent | 80fec4bc4af53af275b2db98cc882422390641e2 (diff) | |
| download | chromium_src-c4bc58d55fb1b29f69fc1bccc93b74e56c99b010.zip chromium_src-c4bc58d55fb1b29f69fc1bccc93b74e56c99b010.tar.gz chromium_src-c4bc58d55fb1b29f69fc1bccc93b74e56c99b010.tar.bz2 | |
Remove CookieMonster bug catching stuff.
BUG=74585
TEST=net_unittests, try bots.
Review URL: http://codereview.chromium.org/6783020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_specific_content_settings.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.cc b/chrome/browser/tab_contents/tab_specific_content_settings.cc index 7dcc0ab..113d528 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.cc +++ b/chrome/browser/tab_contents/tab_specific_content_settings.cc @@ -10,7 +10,6 @@ #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" #include "chrome/browser/cookies_tree_model.h" -#include "chrome/browser/prerender/prerender_manager.h" #include "net/base/cookie_monster.h" bool TabSpecificContentSettings::LocalSharedObjectsContainer::empty() const { @@ -115,7 +114,6 @@ void TabSpecificContentSettings::OnCookiesRead( typedef net::CookieList::const_iterator cookie_iterator; for (cookie_iterator cookie = cookie_list.begin(); cookie != cookie_list.end(); ++cookie) { - container.cookies()->ValidateMap(prerender::PrerenderManager::GetMode()); container.cookies()->SetCookieWithDetails(url, cookie->Name(), cookie->Value(), @@ -124,7 +122,6 @@ void TabSpecificContentSettings::OnCookiesRead( cookie->ExpiryDate(), cookie->IsSecure(), cookie->IsHttpOnly()); - container.cookies()->ValidateMap(prerender::PrerenderManager::GetMode()); } if (blocked_by_policy) OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); @@ -138,20 +135,12 @@ void TabSpecificContentSettings::OnCookieChanged( const net::CookieOptions& options, bool blocked_by_policy) { if (blocked_by_policy) { - blocked_local_shared_objects_.cookies()->ValidateMap( - prerender::PrerenderManager::GetMode()); blocked_local_shared_objects_.cookies()->SetCookieWithOptions( url, cookie_line, options); - blocked_local_shared_objects_.cookies()->ValidateMap( - prerender::PrerenderManager::GetMode()); OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); } else { - allowed_local_shared_objects_.cookies()->ValidateMap( - prerender::PrerenderManager::GetMode()); allowed_local_shared_objects_.cookies()->SetCookieWithOptions( url, cookie_line, options); - allowed_local_shared_objects_.cookies()->ValidateMap( - prerender::PrerenderManager::GetMode()); OnContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES); } } @@ -301,7 +290,6 @@ TabSpecificContentSettings::LocalSharedObjectsContainer:: TabSpecificContentSettings::LocalSharedObjectsContainer:: ~LocalSharedObjectsContainer() { - cookies_->ValidateMap(prerender::PrerenderManager::GetMode()); } void TabSpecificContentSettings::LocalSharedObjectsContainer::Reset() { |