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

Side by Side Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 641343002: Content Shell: Introduce LayoutTestBrowserContext. (Reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed. Created 6 years, 2 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
« no previous file with comments | « content/shell/browser/shell_browser_context.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/shell_browser_main_parts.h" 5 #include "content/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/storage_partition.h" 15 #include "content/public/browser/storage_partition.h"
16 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "content/public/common/main_function_params.h" 17 #include "content/public/common/main_function_params.h"
18 #include "content/public/common/url_constants.h" 18 #include "content/public/common/url_constants.h"
19 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
19 #include "content/shell/browser/shell.h" 20 #include "content/shell/browser/shell.h"
20 #include "content/shell/browser/shell_browser_context.h" 21 #include "content/shell/browser/shell_browser_context.h"
21 #include "content/shell/browser/shell_devtools_delegate.h" 22 #include "content/shell/browser/shell_devtools_delegate.h"
22 #include "content/shell/browser/shell_net_log.h" 23 #include "content/shell/browser/shell_net_log.h"
23 #include "content/shell/common/shell_switches.h" 24 #include "content/shell/common/shell_switches.h"
24 #include "net/base/filename_util.h" 25 #include "net/base/filename_util.h"
25 #include "net/base/net_module.h" 26 #include "net/base/net_module.h"
26 #include "net/grit/net_resources.h" 27 #include "net/grit/net_resources.h"
27 #include "storage/browser/quota/quota_manager.h" 28 #include "storage/browser/quota/quota_manager.h"
28 #include "ui/base/resource/resource_bundle.h" 29 #include "ui/base/resource/resource_bundle.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #if defined(OS_ANDROID) 122 #if defined(OS_ANDROID)
122 if (CommandLine::ForCurrentProcess()->HasSwitch( 123 if (CommandLine::ForCurrentProcess()->HasSwitch(
123 switches::kEnableCrashReporter)) { 124 switches::kEnableCrashReporter)) {
124 base::FilePath crash_dumps_dir = 125 base::FilePath crash_dumps_dir =
125 CommandLine::ForCurrentProcess()->GetSwitchValuePath( 126 CommandLine::ForCurrentProcess()->GetSwitchValuePath(
126 switches::kCrashDumpsDir); 127 switches::kCrashDumpsDir);
127 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dumps_dir)); 128 crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dumps_dir));
128 } 129 }
129 #endif 130 #endif
130 net_log_.reset(new ShellNetLog("content_shell")); 131 net_log_.reset(new ShellNetLog("content_shell"));
131 browser_context_.reset(new ShellBrowserContext(false, net_log_.get())); 132 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
132 off_the_record_browser_context_.reset( 133 browser_context_.reset(new LayoutTestBrowserContext(false, net_log_.get()));
133 new ShellBrowserContext(true, net_log_.get())); 134 off_the_record_browser_context_.reset(
135 new LayoutTestBrowserContext(true, net_log_.get()));
136 } else {
137 browser_context_.reset(new ShellBrowserContext(false, net_log_.get()));
138 off_the_record_browser_context_.reset(
139 new ShellBrowserContext(true, net_log_.get()));
140 }
134 141
135 Shell::Initialize(); 142 Shell::Initialize();
136 net::NetModule::SetResourceProvider(PlatformResourceProvider); 143 net::NetModule::SetResourceProvider(PlatformResourceProvider);
137 144
138 devtools_delegate_.reset(new ShellDevToolsDelegate(browser_context_.get())); 145 devtools_delegate_.reset(new ShellDevToolsDelegate(browser_context_.get()));
139 146
140 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { 147 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
141 Shell::CreateNewWindow(browser_context_.get(), 148 Shell::CreateNewWindow(browser_context_.get(),
142 GetStartupURL(), 149 GetStartupURL(),
143 NULL, 150 NULL,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 183 }
177 184
178 void ShellBrowserMainParts::PostMainMessageLoopRun() { 185 void ShellBrowserMainParts::PostMainMessageLoopRun() {
179 if (devtools_delegate_) 186 if (devtools_delegate_)
180 devtools_delegate_->Stop(); 187 devtools_delegate_->Stop();
181 browser_context_.reset(); 188 browser_context_.reset();
182 off_the_record_browser_context_.reset(); 189 off_the_record_browser_context_.reset();
183 } 190 }
184 191
185 } // namespace 192 } // namespace
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698