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

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

Issue 8467028: Enable DVLOG on non official release build based on the parameter passed for InitLogging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For review. Created 9 years, 1 month 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
« no previous file with comments | « webkit/support/webkit_support.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) 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 // We might have multiple test_shell processes going at once 254 // We might have multiple test_shell processes going at once
255 FilePath log_filename; 255 FilePath log_filename;
256 PathService::Get(base::DIR_EXE, &log_filename); 256 PathService::Get(base::DIR_EXE, &log_filename);
257 log_filename = log_filename.AppendASCII("test_shell.log"); 257 log_filename = log_filename.AppendASCII("test_shell.log");
258 logging::InitLogging( 258 logging::InitLogging(
259 log_filename.value().c_str(), 259 log_filename.value().c_str(),
260 destination, 260 destination,
261 logging::LOCK_LOG_FILE, 261 logging::LOCK_LOG_FILE,
262 logging::DELETE_OLD_LOG_FILE, 262 logging::DELETE_OLD_LOG_FILE,
263 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); 263 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS,
264 logging::DISABLE_DLOG_FOR_NON_OFFICIAL_RELEASE_BUILDS);
264 265
265 // we want process and thread IDs because we may have multiple processes 266 // we want process and thread IDs because we may have multiple processes
266 logging::SetLogItems(true, true, false, true); 267 logging::SetLogItems(true, true, false, true);
267 268
268 // Turn on logging of notImplemented()s inside WebKit, but only if we're 269 // Turn on logging of notImplemented()s inside WebKit, but only if we're
269 // not running layout tests (because otherwise they'd corrupt the test 270 // not running layout tests (because otherwise they'd corrupt the test
270 // output). 271 // output).
271 if (!layout_test_mode) 272 if (!layout_test_mode)
272 webkit_glue::EnableWebCoreLogChannels("NotYetImplemented"); 273 webkit_glue::EnableWebCoreLogChannels("NotYetImplemented");
273 } 274 }
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 webkit::WebPluginInfo plugin_info = plugins->at(i); 656 webkit::WebPluginInfo plugin_info = plugins->at(i);
656 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { 657 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
657 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { 658 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
658 plugins->erase(plugins->begin() + i); 659 plugins->erase(plugins->begin() + i);
659 } 660 }
660 } 661 }
661 } 662 }
662 } 663 }
663 664
664 } // namespace webkit_glue 665 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698