Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 10836305: Ensure that isolated apps use the right cookies for media requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browsing_data/browsing_data_remover.h" 5 #include "chrome/browser/browsing_data/browsing_data_remover.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 base::Time delete_end) 106 base::Time delete_end)
107 : profile_(profile), 107 : profile_(profile),
108 quota_manager_(NULL), 108 quota_manager_(NULL),
109 dom_storage_context_(NULL), 109 dom_storage_context_(NULL),
110 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), 110 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
111 delete_begin_(delete_begin), 111 delete_begin_(delete_begin),
112 delete_end_(delete_end), 112 delete_end_(delete_end),
113 next_cache_state_(STATE_NONE), 113 next_cache_state_(STATE_NONE),
114 cache_(NULL), 114 cache_(NULL),
115 main_context_getter_(profile->GetRequestContext()), 115 main_context_getter_(profile->GetRequestContext()),
116 media_context_getter_(profile->GetRequestContextForMedia()), 116 media_context_getter_(profile->GetMediaRequestContext()),
117 deauthorize_content_licenses_request_id_(0), 117 deauthorize_content_licenses_request_id_(0),
118 waiting_for_clear_cache_(false), 118 waiting_for_clear_cache_(false),
119 waiting_for_clear_nacl_cache_(false), 119 waiting_for_clear_nacl_cache_(false),
120 waiting_for_clear_cookies_count_(0), 120 waiting_for_clear_cookies_count_(0),
121 waiting_for_clear_history_(false), 121 waiting_for_clear_history_(false),
122 waiting_for_clear_local_storage_(false), 122 waiting_for_clear_local_storage_(false),
123 waiting_for_clear_networking_history_(false), 123 waiting_for_clear_networking_history_(false),
124 waiting_for_clear_server_bound_certs_(false), 124 waiting_for_clear_server_bound_certs_(false),
125 waiting_for_clear_plugin_data_(false), 125 waiting_for_clear_plugin_data_(false),
126 waiting_for_clear_quota_managed_data_(false), 126 waiting_for_clear_quota_managed_data_(false),
(...skipping 15 matching lines...) Expand all
142 base::Time delete_end) 142 base::Time delete_end)
143 : profile_(profile), 143 : profile_(profile),
144 quota_manager_(NULL), 144 quota_manager_(NULL),
145 dom_storage_context_(NULL), 145 dom_storage_context_(NULL),
146 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()), 146 special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
147 delete_begin_(CalculateBeginDeleteTime(time_period)), 147 delete_begin_(CalculateBeginDeleteTime(time_period)),
148 delete_end_(delete_end), 148 delete_end_(delete_end),
149 next_cache_state_(STATE_NONE), 149 next_cache_state_(STATE_NONE),
150 cache_(NULL), 150 cache_(NULL),
151 main_context_getter_(profile->GetRequestContext()), 151 main_context_getter_(profile->GetRequestContext()),
152 media_context_getter_(profile->GetRequestContextForMedia()), 152 media_context_getter_(profile->GetMediaRequestContext()),
153 deauthorize_content_licenses_request_id_(0), 153 deauthorize_content_licenses_request_id_(0),
154 waiting_for_clear_cache_(false), 154 waiting_for_clear_cache_(false),
155 waiting_for_clear_nacl_cache_(false), 155 waiting_for_clear_nacl_cache_(false),
156 waiting_for_clear_cookies_count_(0), 156 waiting_for_clear_cookies_count_(0),
157 waiting_for_clear_history_(false), 157 waiting_for_clear_history_(false),
158 waiting_for_clear_local_storage_(false), 158 waiting_for_clear_local_storage_(false),
159 waiting_for_clear_networking_history_(false), 159 waiting_for_clear_networking_history_(false),
160 waiting_for_clear_server_bound_certs_(false), 160 waiting_for_clear_server_bound_certs_(false),
161 waiting_for_clear_plugin_data_(false), 161 waiting_for_clear_plugin_data_(false),
162 waiting_for_clear_quota_managed_data_(false), 162 waiting_for_clear_quota_managed_data_(false),
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 BrowserThread::UI, FROM_HERE, 898 BrowserThread::UI, FROM_HERE,
899 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts, 899 base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
900 base::Unretained(this))); 900 base::Unretained(this)));
901 } 901 }
902 902
903 void BrowsingDataRemover::OnClearedServerBoundCerts() { 903 void BrowsingDataRemover::OnClearedServerBoundCerts() {
904 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 904 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
905 waiting_for_clear_server_bound_certs_ = false; 905 waiting_for_clear_server_bound_certs_ = false;
906 NotifyAndDeleteIfDone(); 906 NotifyAndDeleteIfDone();
907 } 907 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698