| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #undef LOG | 5 #undef LOG |
| 6 | 6 |
| 7 #include "webkit/tools/test_shell/test_shell.h" | 7 #include "webkit/tools/test_shell/test_shell.h" |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 logging::DELETE_OLD_LOG_FILE, | 259 logging::DELETE_OLD_LOG_FILE, |
| 260 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); | 260 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); |
| 261 | 261 |
| 262 // we want process and thread IDs because we may have multiple processes | 262 // we want process and thread IDs because we may have multiple processes |
| 263 logging::SetLogItems(true, true, false, true); | 263 logging::SetLogItems(true, true, false, true); |
| 264 | 264 |
| 265 // Turn on logging of notImplemented()s inside WebKit, but only if we're | 265 // Turn on logging of notImplemented()s inside WebKit, but only if we're |
| 266 // not running layout tests (because otherwise they'd corrupt the test | 266 // not running layout tests (because otherwise they'd corrupt the test |
| 267 // output). | 267 // output). |
| 268 if (!layout_test_mode) | 268 if (!layout_test_mode) |
| 269 webkit_glue::EnableWebCoreNotImplementedLogging(); | 269 webkit_glue::EnableWebCoreLogChannels("NotYetImplemented"); |
| 270 } | 270 } |
| 271 | 271 |
| 272 // static | 272 // static |
| 273 void TestShell::CleanupLogging() { | 273 void TestShell::CleanupLogging() { |
| 274 logging::CloseLogFile(); | 274 logging::CloseLogFile(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 // static | 277 // static |
| 278 void TestShell::SetAllowScriptsToCloseWindows() { | 278 void TestShell::SetAllowScriptsToCloseWindows() { |
| 279 if (web_prefs_) | 279 if (web_prefs_) |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 730 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 730 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
| 731 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 731 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
| 732 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); | 732 webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); |
| 733 plugins->erase(plugins->begin() + i); | 733 plugins->erase(plugins->begin() + i); |
| 734 } | 734 } |
| 735 } | 735 } |
| 736 } | 736 } |
| 737 } | 737 } |
| 738 | 738 |
| 739 } // namespace webkit_glue | 739 } // namespace webkit_glue |
| OLD | NEW |