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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 6070006: Made logging not look up --enable-dcheck from command line (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed more compile failures Created 9 years, 11 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
« no previous file with comments | « chrome_frame/crash_reporting/minidump_test.cc ('k') | courgette/courgette_tool.cc » ('j') | 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 #include "chrome_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 10
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 if (PromptAfterSetup()) 377 if (PromptAfterSetup())
378 MessageBoxA(NULL, "click ok to exit", "", MB_OK); 378 MessageBoxA(NULL, "click ok to exit", "", MB_OK);
379 379
380 me->ShutDownHostBrowser(); 380 me->ShutDownHostBrowser();
381 } 381 }
382 382
383 void CFUrlRequestUnittestRunner::InitializeLogging() { 383 void CFUrlRequestUnittestRunner::InitializeLogging() {
384 FilePath exe; 384 FilePath exe;
385 PathService::Get(base::FILE_EXE, &exe); 385 PathService::Get(base::FILE_EXE, &exe);
386 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); 386 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
387 logging::InitLogging(log_filename.value().c_str(), 387 logging::InitLogging(
388 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, 388 log_filename.value().c_str(),
389 logging::LOCK_LOG_FILE, 389 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
390 logging::DELETE_OLD_LOG_FILE); 390 logging::LOCK_LOG_FILE,
391 logging::DELETE_OLD_LOG_FILE,
392 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
391 // We want process and thread IDs because we may have multiple processes. 393 // We want process and thread IDs because we may have multiple processes.
392 // Note: temporarily enabled timestamps in an effort to catch bug 6361. 394 // Note: temporarily enabled timestamps in an effort to catch bug 6361.
393 logging::SetLogItems(true, true, true, true); 395 logging::SetLogItems(true, true, true, true);
394 } 396 }
395 397
396 void FilterDisabledTests() { 398 void FilterDisabledTests() {
397 if (::testing::FLAGS_gtest_filter.length() && 399 if (::testing::FLAGS_gtest_filter.length() &&
398 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { 400 ::testing::FLAGS_gtest_filter.Compare("*") != 0) {
399 // Don't override user specified filters. 401 // Don't override user specified filters.
400 return; 402 return;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 // See url_request_unittest.cc for these credentials. 496 // See url_request_unittest.cc for these credentials.
495 SupplyProxyCredentials credentials("user", "secret"); 497 SupplyProxyCredentials credentials("user", "secret");
496 watchdog.AddObserver(&credentials, "Windows Security", ""); 498 watchdog.AddObserver(&credentials, "Windows Security", "");
497 testing::InitGoogleTest(&argc, argv); 499 testing::InitGoogleTest(&argc, argv);
498 FilterDisabledTests(); 500 FilterDisabledTests();
499 PluginService::EnableChromePlugins(false); 501 PluginService::EnableChromePlugins(false);
500 CFUrlRequestUnittestRunner test_suite(argc, argv); 502 CFUrlRequestUnittestRunner test_suite(argc, argv);
501 test_suite.RunMainUIThread(); 503 test_suite.RunMainUIThread();
502 return 0; 504 return 0;
503 } 505 }
OLDNEW
« no previous file with comments | « chrome_frame/crash_reporting/minidump_test.cc ('k') | courgette/courgette_tool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698