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

Side by Side Diff: chrome/test/base/testing_profile.h

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 | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/test/base/testing_profile.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 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_ 6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 void SetPrefService(PrefService* prefs); 231 void SetPrefService(PrefService* prefs);
232 virtual PrefService* GetPrefs() OVERRIDE; 232 virtual PrefService* GetPrefs() OVERRIDE;
233 virtual history::TopSites* GetTopSites() OVERRIDE; 233 virtual history::TopSites* GetTopSites() OVERRIDE;
234 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE; 234 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
235 235
236 void CreateRequestContext(); 236 void CreateRequestContext();
237 // Clears out the created request context (which must be done before shutting 237 // Clears out the created request context (which must be done before shutting
238 // down the IO thread to avoid leaks). 238 // down the IO thread to avoid leaks).
239 void ResetRequestContext(); 239 void ResetRequestContext();
240 240
241 virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE; 241 virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
242 virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
243 int renderer_child_id) OVERRIDE;
242 virtual net::URLRequestContextGetter* 244 virtual net::URLRequestContextGetter*
243 GetRequestContextForExtensions() OVERRIDE; 245 GetRequestContextForExtensions() OVERRIDE;
244 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp( 246 virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(
245 const std::string& app_id) OVERRIDE; 247 const std::string& app_id) OVERRIDE;
246 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE; 248 virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
247 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE; 249 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
248 virtual std::wstring GetName(); 250 virtual std::wstring GetName();
249 virtual void SetName(const std::wstring& name) {} 251 virtual void SetName(const std::wstring& name) {}
250 virtual std::wstring GetID(); 252 virtual std::wstring GetID();
251 virtual void SetID(const std::wstring& id); 253 virtual void SetID(const std::wstring& id);
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 // testing. 365 // testing.
364 ProfileDependencyManager* profile_dependency_manager_; 366 ProfileDependencyManager* profile_dependency_manager_;
365 367
366 scoped_ptr<content::MockResourceContext> resource_context_; 368 scoped_ptr<content::MockResourceContext> resource_context_;
367 369
368 // Weak pointer to a delegate for indicating that a profile was created. 370 // Weak pointer to a delegate for indicating that a profile was created.
369 Delegate* delegate_; 371 Delegate* delegate_;
370 }; 372 };
371 373
372 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 374 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698