| OLD | NEW |
| 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/test/base/testing_profile.h" | 5 #include "chrome/test/base/testing_profile.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 } | 838 } |
| 839 | 839 |
| 840 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess( | 840 net::URLRequestContextGetter* TestingProfile::GetRequestContextForRenderProcess( |
| 841 int renderer_child_id) { | 841 int renderer_child_id) { |
| 842 content::RenderProcessHost* rph = content::RenderProcessHost::FromID( | 842 content::RenderProcessHost* rph = content::RenderProcessHost::FromID( |
| 843 renderer_child_id); | 843 renderer_child_id); |
| 844 return rph->GetStoragePartition()->GetURLRequestContext(); | 844 return rph->GetStoragePartition()->GetURLRequestContext(); |
| 845 } | 845 } |
| 846 | 846 |
| 847 net::URLRequestContextGetter* TestingProfile::GetMediaRequestContext() { | 847 net::URLRequestContextGetter* TestingProfile::GetMediaRequestContext() { |
| 848 return NULL; | 848 // We don't test the media context here yet, so returning the same dummy |
| 849 // context is sufficient for now. |
| 850 return GetRequestContext(); |
| 849 } | 851 } |
| 850 | 852 |
| 851 net::URLRequestContextGetter* | 853 net::URLRequestContextGetter* |
| 852 TestingProfile::GetMediaRequestContextForRenderProcess( | 854 TestingProfile::GetMediaRequestContextForRenderProcess( |
| 853 int renderer_child_id) { | 855 int renderer_child_id) { |
| 854 return NULL; | 856 return NULL; |
| 855 } | 857 } |
| 856 | 858 |
| 857 net::URLRequestContextGetter* | 859 net::URLRequestContextGetter* |
| 858 TestingProfile::GetMediaRequestContextForStoragePartition( | 860 TestingProfile::GetMediaRequestContextForStoragePartition( |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1084 #if defined(ENABLE_EXTENSIONS) | 1086 #if defined(ENABLE_EXTENSIONS) |
| 1085 extension_policy_, | 1087 extension_policy_, |
| 1086 #endif | 1088 #endif |
| 1087 pref_service_.Pass(), | 1089 pref_service_.Pass(), |
| 1088 original_profile, | 1090 original_profile, |
| 1089 guest_session_, | 1091 guest_session_, |
| 1090 supervised_user_id_, | 1092 supervised_user_id_, |
| 1091 policy_service_.Pass(), | 1093 policy_service_.Pass(), |
| 1092 testing_factories_); | 1094 testing_factories_); |
| 1093 } | 1095 } |
| OLD | NEW |