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

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: Created 10 years 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
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 "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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 if (PromptAfterSetup()) 375 if (PromptAfterSetup())
376 MessageBoxA(NULL, "click ok to exit", "", MB_OK); 376 MessageBoxA(NULL, "click ok to exit", "", MB_OK);
377 377
378 me->ShutDownHostBrowser(); 378 me->ShutDownHostBrowser();
379 } 379 }
380 380
381 void CFUrlRequestUnittestRunner::InitializeLogging() { 381 void CFUrlRequestUnittestRunner::InitializeLogging() {
382 FilePath exe; 382 FilePath exe;
383 PathService::Get(base::FILE_EXE, &exe); 383 PathService::Get(base::FILE_EXE, &exe);
384 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); 384 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
385 logging::InitLogging(log_filename.value().c_str(), 385 logging::InitLogging(
386 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, 386 log_filename.value().c_str(),
387 logging::LOCK_LOG_FILE, 387 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
388 logging::DELETE_OLD_LOG_FILE); 388 logging::LOCK_LOG_FILE,
389 logging::DELETE_OLD_LOG_FILE,
390 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
389 // We want process and thread IDs because we may have multiple processes. 391 // We want process and thread IDs because we may have multiple processes.
390 // Note: temporarily enabled timestamps in an effort to catch bug 6361. 392 // Note: temporarily enabled timestamps in an effort to catch bug 6361.
391 logging::SetLogItems(true, true, true, true); 393 logging::SetLogItems(true, true, true, true);
392 } 394 }
393 395
394 void FilterDisabledTests() { 396 void FilterDisabledTests() {
395 if (::testing::FLAGS_gtest_filter.length() && 397 if (::testing::FLAGS_gtest_filter.length() &&
396 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { 398 ::testing::FLAGS_gtest_filter.Compare("*") != 0) {
397 // Don't override user specified filters. 399 // Don't override user specified filters.
398 return; 400 return;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 // See url_request_unittest.cc for these credentials. 494 // See url_request_unittest.cc for these credentials.
493 SupplyProxyCredentials credentials("user", "secret"); 495 SupplyProxyCredentials credentials("user", "secret");
494 watchdog.AddObserver(&credentials, "Windows Security", ""); 496 watchdog.AddObserver(&credentials, "Windows Security", "");
495 testing::InitGoogleTest(&argc, argv); 497 testing::InitGoogleTest(&argc, argv);
496 FilterDisabledTests(); 498 FilterDisabledTests();
497 PluginService::EnableChromePlugins(false); 499 PluginService::EnableChromePlugins(false);
498 CFUrlRequestUnittestRunner test_suite(argc, argv); 500 CFUrlRequestUnittestRunner test_suite(argc, argv);
499 test_suite.RunMainUIThread(); 501 test_suite.RunMainUIThread();
500 return 0; 502 return 0;
501 } 503 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698