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

Side by Side Diff: content/public/test/test_browser_context.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 | « content/public/test/test_browser_context.h ('k') | content/shell/shell_browser_context.h » ('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 "content/public/test/test_browser_context.h" 5 #include "content/public/test/test_browser_context.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "content/public/test/mock_resource_context.h" 8 #include "content/public/test/mock_resource_context.h"
9 #include "net/url_request/url_request_context.h" 9 #include "net/url_request/url_request_context.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() { 43 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() {
44 return NULL; 44 return NULL;
45 } 45 }
46 46
47 net::URLRequestContextGetter* 47 net::URLRequestContextGetter*
48 TestBrowserContext::GetRequestContextForRenderProcess(int renderer_child_id) { 48 TestBrowserContext::GetRequestContextForRenderProcess(int renderer_child_id) {
49 return NULL; 49 return NULL;
50 } 50 }
51 51
52 net::URLRequestContextGetter* TestBrowserContext::GetRequestContextForMedia() { 52 net::URLRequestContextGetter* TestBrowserContext::GetMediaRequestContext() {
53 return NULL; 53 return NULL;
54 } 54 }
55 55
56 net::URLRequestContextGetter*
57 TestBrowserContext::GetMediaRequestContextForRenderProcess(
58 int renderer_child_id) {
59 return NULL;
60 }
61
56 ResourceContext* TestBrowserContext::GetResourceContext() { 62 ResourceContext* TestBrowserContext::GetResourceContext() {
57 if (!resource_context_.get()) 63 if (!resource_context_.get())
58 resource_context_.reset(new MockResourceContext()); 64 resource_context_.reset(new MockResourceContext());
59 return resource_context_.get(); 65 return resource_context_.get();
60 } 66 }
61 67
62 GeolocationPermissionContext* 68 GeolocationPermissionContext*
63 TestBrowserContext::GetGeolocationPermissionContext() { 69 TestBrowserContext::GetGeolocationPermissionContext() {
64 return NULL; 70 return NULL;
65 } 71 }
66 72
67 SpeechRecognitionPreferences* 73 SpeechRecognitionPreferences*
68 TestBrowserContext::GetSpeechRecognitionPreferences() { 74 TestBrowserContext::GetSpeechRecognitionPreferences() {
69 return NULL; 75 return NULL;
70 } 76 }
71 77
72 bool TestBrowserContext::DidLastSessionExitCleanly() { 78 bool TestBrowserContext::DidLastSessionExitCleanly() {
73 return true; 79 return true;
74 } 80 }
75 81
76 quota::SpecialStoragePolicy* TestBrowserContext::GetSpecialStoragePolicy() { 82 quota::SpecialStoragePolicy* TestBrowserContext::GetSpecialStoragePolicy() {
77 return special_storage_policy_.get(); 83 return special_storage_policy_.get();
78 } 84 }
79 85
80 } // namespace content 86 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/test_browser_context.h ('k') | content/shell/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698