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

Side by Side Diff: webkit/tools/test_shell/test_shell_main.cc

Issue 2881028: GTTF: test server cleanup: (Closed)
Patch Set: final Created 10 years, 5 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 | « net/url_request/url_request_unittest.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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/basictypes.h" 6 #include "base/basictypes.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/env_var.h" 8 #include "base/env_var.h"
9 #include "base/event_recorder.h" 9 #include "base/event_recorder.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 SimpleResourceLoaderBridge::Init(cache_path, cache_mode, layout_test_mode); 169 SimpleResourceLoaderBridge::Init(cache_path, cache_mode, layout_test_mode);
170 170
171 // Load ICU data tables 171 // Load ICU data tables
172 icu_util::Initialize(); 172 icu_util::Initialize();
173 173
174 // Config the network module so it has access to a limited set of resources. 174 // Config the network module so it has access to a limited set of resources.
175 net::NetModule::SetResourceProvider(TestShell::NetResourceProvider); 175 net::NetModule::SetResourceProvider(TestShell::NetResourceProvider);
176 176
177 // On Linux and Mac, load the test root certificate. 177 // On Linux and Mac, load the test root certificate.
178 net::TestServerLauncher ssl_util; 178 net::TestServerLauncher ssl_util;
179 ssl_util.LoadTestRootCert(); 179 if (!ssl_util.LoadTestRootCert()) {
180 LOG(ERROR) << "Failed to load test root certificate.";
181 }
180 182
181 platform.InitializeGUI(); 183 platform.InitializeGUI();
182 184
183 if (parsed_command_line.HasSwitch(test_shell::kEnableLegacyParser)) { 185 if (parsed_command_line.HasSwitch(test_shell::kEnableLegacyParser)) {
184 TestShell::disable_html5_parser(); 186 TestShell::disable_html5_parser();
185 } 187 }
186 188
187 TestShell::InitializeTestShell(layout_test_mode, allow_external_pages); 189 TestShell::InitializeTestShell(layout_test_mode, allow_external_pages);
188 190
189 if (parsed_command_line.HasSwitch(test_shell::kAllowScriptsToCloseWindows)) 191 if (parsed_command_line.HasSwitch(test_shell::kAllowScriptsToCloseWindows))
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 TestShell::ShutdownTestShell(); 388 TestShell::ShutdownTestShell();
387 TestShell::CleanupLogging(); 389 TestShell::CleanupLogging();
388 390
389 // Tear down shared StatsTable; prevents unit_tests from leaking it. 391 // Tear down shared StatsTable; prevents unit_tests from leaking it.
390 StatsTable::set_current(NULL); 392 StatsTable::set_current(NULL);
391 delete table; 393 delete table;
392 RemoveSharedMemoryFile(stats_filename); 394 RemoveSharedMemoryFile(stats_filename);
393 395
394 return 0; 396 return 0;
395 } 397 }
OLDNEW
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698