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

Side by Side Diff: trunk/src/content/shell/app/shell_main_delegate.cc

Issue 23551005: Revert 219709 "Remove the Extensions URLRequestContext." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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
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/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 switches::kEnableExperimentalWebPlatformFeatures); 142 switches::kEnableExperimentalWebPlatformFeatures);
143 command_line.AppendSwitch(switches::kEnableCssShaders); 143 command_line.AppendSwitch(switches::kEnableCssShaders);
144 } 144 }
145 145
146 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) 146 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing))
147 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); 147 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
148 148
149 command_line.AppendSwitch(switches::kEnableInbandTextTracks); 149 command_line.AppendSwitch(switches::kEnableInbandTextTracks);
150 command_line.AppendSwitch(switches::kMuteAudio); 150 command_line.AppendSwitch(switches::kMuteAudio);
151 151
152 net::CookieMonster::EnableFileScheme();
153
152 // Unless/until WebM files are added to the media layout tests, we need to 154 // Unless/until WebM files are added to the media layout tests, we need to
153 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 155 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
154 #if !defined(OS_ANDROID) 156 #if !defined(OS_ANDROID)
155 net::RemoveProprietaryMediaTypesAndCodecsForTests(); 157 net::RemoveProprietaryMediaTypesAndCodecsForTests();
156 #endif 158 #endif
157 159
158 if (!WebKitTestPlatformInitialize()) { 160 if (!WebKitTestPlatformInitialize()) {
159 if (exit_code) 161 if (exit_code)
160 *exit_code = 1; 162 *exit_code = 1;
161 return true; 163 return true;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 browser_client_.reset(new ShellContentBrowserClient); 225 browser_client_.reset(new ShellContentBrowserClient);
224 return browser_client_.get(); 226 return browser_client_.get();
225 } 227 }
226 228
227 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 229 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
228 renderer_client_.reset(new ShellContentRendererClient); 230 renderer_client_.reset(new ShellContentRendererClient);
229 return renderer_client_.get(); 231 return renderer_client_.get();
230 } 232 }
231 233
232 } // namespace content 234 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/public/test/test_browser_context.cc ('k') | trunk/src/content/shell/browser/shell_browser_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698