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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 9838058: More non-debug logging in Chrome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright and formatting tweaks Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_test_utils.cc
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 59b542a76e8738f296a5270525ed8ccd2781ba70..77f02fb14ce592a9ee90a5ddf4b6d0c2098fe0ab 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -70,8 +70,8 @@ BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) {
}
count++;
} else {
- DLOG(WARNING) << "Skipping disabled window: "
- << base::StringPrintf(L"%08X", hwnd);
+ LOG(WARNING) << "Skipping disabled window: "
+ << base::StringPrintf(L"%08X", hwnd);
}
}
return TRUE; // continue enumeration
@@ -297,7 +297,7 @@ BOOL LowIntegrityToken::Impersonate() {
BOOL ok = ::OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE,
&process_token_handle);
if (!ok) {
- DLOG(ERROR) << "::OpenProcessToken failed: " << GetLastError();
+ LOG(ERROR) << "::OpenProcessToken failed: " << GetLastError();
return ok;
}
@@ -308,7 +308,7 @@ BOOL LowIntegrityToken::Impersonate() {
TOKEN_QUERY | TOKEN_IMPERSONATE | TOKEN_ADJUST_DEFAULT, NULL,
SecurityImpersonation, TokenImpersonation, &impersonation_token_handle);
if (!ok) {
- DLOG(ERROR) << "::DuplicateTokenEx failed: " << GetLastError();
+ LOG(ERROR) << "::DuplicateTokenEx failed: " << GetLastError();
return ok;
}
@@ -319,7 +319,7 @@ BOOL LowIntegrityToken::Impersonate() {
TOKEN_MANDATORY_LABEL tml = {0};
ok = ::ConvertStringSidToSid(SDDL_ML_LOW, &integrity_sid);
if (!ok) {
- DLOG(ERROR) << "::ConvertStringSidToSid failed: " << GetLastError();
+ LOG(ERROR) << "::ConvertStringSidToSid failed: " << GetLastError();
return ok;
}
@@ -329,7 +329,7 @@ BOOL LowIntegrityToken::Impersonate() {
&tml, sizeof(tml) + ::GetLengthSid(integrity_sid));
::LocalFree(integrity_sid);
if (!ok) {
- DLOG(ERROR) << "::SetTokenInformation failed: " << GetLastError();
+ LOG(ERROR) << "::SetTokenInformation failed: " << GetLastError();
return ok;
}
@@ -338,7 +338,7 @@ BOOL LowIntegrityToken::Impersonate() {
if (ok) {
impersonated_ = true;
} else {
- DLOG(ERROR) << "::ImpersonateLoggedOnUser failed: " << GetLastError();
+ LOG(ERROR) << "::ImpersonateLoggedOnUser failed: " << GetLastError();
}
return ok;
@@ -521,8 +521,8 @@ bool AddCFMetaTag(std::string* html_data) {
head = html + strlen("<html>");
html_data->insert(head, "<head></head>");
} else {
- DLOG(ERROR) << "Meta tag will not be injected "
- << "because the html tag could not be found";
+ LOG(ERROR) << "Meta tag will not be injected "
+ << "because the html tag could not be found";
}
}
if (head != std::string::npos) {
@@ -535,7 +535,7 @@ bool AddCFMetaTag(std::string* html_data) {
CloseIeAtEndOfScope::~CloseIeAtEndOfScope() {
int closed = CloseAllIEWindows();
- DLOG_IF(ERROR, closed != 0) << "Closed " << closed << " windows forcefully";
+ LOG_IF(ERROR, closed != 0) << "Closed " << closed << " windows forcefully";
}
// Attempt to connect to a running crash_service instance. Success occurs if we
@@ -590,8 +590,8 @@ bool DetectRunningCrashService(int timeout_ms) {
base::ProcessHandle StartCrashService() {
if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
- DVLOG(1) << "crash_service.exe is already running. We will use the "
- "existing process and leave it running after tests complete.";
+ VLOG(1) << "crash_service.exe is already running. We will use the "
+ "existing process and leave it running after tests complete.";
return NULL;
}
@@ -603,25 +603,25 @@ base::ProcessHandle StartCrashService() {
base::ProcessHandle crash_service = NULL;
- DVLOG(1) << "Starting crash_service.exe so you know if a test crashes!";
+ VLOG(1) << "Starting crash_service.exe so you know if a test crashes!";
FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe");
if (!base::LaunchProcess(crash_service_path.value(), base::LaunchOptions(),
&crash_service)) {
- DLOG(ERROR) << "Couldn't start crash_service.exe";
+ LOG(ERROR) << "Couldn't start crash_service.exe";
return NULL;
}
base::Time start = base::Time::Now();
if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
- DVLOG(1) << "crash_service.exe is ready for clients in "
- << (base::Time::Now() - start).InMilliseconds() << " ms.";
+ VLOG(1) << "crash_service.exe is ready for clients in "
+ << (base::Time::Now() - start).InMilliseconds() << " ms.";
return crash_service;
} else {
- DLOG(ERROR) << "crash_service.exe failed to accept client connections "
- "within " << kCrashServiceStartupTimeoutMs << " ms. "
- "Terminating it now.";
+ LOG(ERROR) << "crash_service.exe failed to accept client connections "
+ "within " << kCrashServiceStartupTimeoutMs << " ms. "
+ "Terminating it now.";
// First check to see if it's even still running just to minimize the
// likelihood of spurious error messages from KillProcess.
« no previous file with comments | « no previous file | chrome_frame/test/chrome_frame_ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698