Changing DLOG to LOG for tests so that we'll get the errors in the test run logs.

TEST=n/a
BUG=none

Review URL: http://codereview.chromium.org/552018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36420 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 21 insertions, 16 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index f1ef010..faee92a 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -51,7 +51,7 @@ BOOL CALLBACK CloseWindowsThreadCallback(HWND hwnd, LPARAM param) {
       DWORD results = 0;
       if (!::SendMessageTimeout(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0, SMTO_BLOCK,
                                 10000, &results)) {
-        DLOG(WARNING) << "Window hung: " << StringPrintf(L"%08X", hwnd);
+        LOG(WARNING) << "Window hung: " << StringPrintf(L"%08X", hwnd);
       }
       count++;
     } else {
@@ -196,7 +196,7 @@ bool EnsureProcessInForeground(base::ProcessId process_id) {
   }
 
   bool ret = ForceSetForegroundWindow(paw.hwnd);
-  DLOG_IF(ERROR, !ret) << "ForceSetForegroundWindow: " << ret;
+  LOG_IF(ERROR, !ret) << "ForceSetForegroundWindow: " << ret;
 
   return ret;
 }
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index e389087..ce7bfaa 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -119,7 +119,7 @@ void ChromeFrameTestWithWebServer::CloseBrowser() {
     DWORD exit_code = 0;
     if (!::GetExitCodeProcess(browser_handle_, &exit_code) ||
         exit_code == STILL_ACTIVE) {
-      DLOG(ERROR) << L"Forcefully killing browser process. Exit:" << exit_code;
+      LOG(ERROR) << L"Forcefully killing browser process. Exit:" << exit_code;
       base::KillProcess(browser_handle_, 0, true);
     }
     browser_handle_.Close();
@@ -168,7 +168,7 @@ bool ChromeFrameTestWithWebServer::CheckResultFile(
     ret = (data == expected_result);
 
   if (!ret) {
-    DLOG(ERROR) << "Error text: " << (data.empty() ? "<empty>" : data.c_str());
+    LOG(ERROR) << "Error text: " << (data.empty() ? "<empty>" : data.c_str());
   }
 
   return ret;
@@ -184,7 +184,7 @@ void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser,
 void ChromeFrameTestWithWebServer::OptionalBrowserTest(BrowserKind browser,
     const wchar_t* page, const wchar_t* result_file_to_check) {
   if (!LaunchBrowser(browser, page)) {
-    DLOG(ERROR) << "Failed to launch browser " << ToString(browser);
+    LOG(ERROR) << "Failed to launch browser " << ToString(browser);
   } else {
     ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
     ASSERT_TRUE(CheckResultFile(result_file_to_check, "OK"));
@@ -304,7 +304,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_ObjectFocus) {
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeOpera_ObjectFocus) {
   if (!LaunchBrowser(OPERA, kNavigateSimpleObjectFocus)) {
-    DLOG(ERROR) << "Failed to launch browser " << ToString(OPERA);
+    LOG(ERROR) << "Failed to launch browser " << ToString(OPERA);
   } else {
     ASSERT_TRUE(WaitForOnLoad(kLongWaitTimeout));
     BringBrowserToTop();
@@ -1431,10 +1431,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) {
 
   // Navigate to url 2 after the previous navigation is complete
   EXPECT_CALL(mock,
-              OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
-                                testing::StrCaseEq(kSubFrameUrl1)),
+      OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
+                                          testing::StrCaseEq(kSubFrameUrl1)),
                                 _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
+
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
   EXPECT_CALL(mock, OnLoad(testing::StrEq(kSubFrameUrl1)))
@@ -1445,10 +1446,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) {
 
   // Navigate to url 3 after the previous navigation is complete
   EXPECT_CALL(mock,
-              OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
-                                testing::StrCaseEq(kSubFrameUrl2)),
+      OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
+                                          testing::StrCaseEq(kSubFrameUrl2)),
                                 _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
+
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
   EXPECT_CALL(mock, OnLoad(testing::StrEq(kSubFrameUrl2)))
@@ -1460,10 +1462,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) {
   // We have reached url 3 and have two back entries for url 1 & 2
   // Go back to url 2 now
   EXPECT_CALL(mock,
-              OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
-                                testing::StrCaseEq(kSubFrameUrl3)),
+      OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
+                                          testing::StrCaseEq(kSubFrameUrl3)),
                                 _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
+
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
   EXPECT_CALL(mock, OnLoad(testing::StrEq(kSubFrameUrl3)))
@@ -1474,10 +1477,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) {
   // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3
   // Go back to url 1 now
   EXPECT_CALL(mock,
-              OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
-                                testing::StrCaseEq(kSubFrameUrl2)),
+      OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
+                                          testing::StrCaseEq(kSubFrameUrl2)),
                                 _, _, _, _, _))
       .WillOnce(testing::Return(S_OK));
+
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
   EXPECT_CALL(mock, OnLoad(testing::StrEq(kSubFrameUrl2)))
@@ -1488,9 +1492,10 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) {
   // We have reached url 1 and have 0 back & 2 forward entries for url 2 & 3
   // Go back to url 1 now
   EXPECT_CALL(mock,
-              OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
-                                testing::StrCaseEq(kSubFrameUrl1)),
+      OnBeforeNavigate2(_, testing::Field(&VARIANT::bstrVal,
+                                          testing::StrCaseEq(kSubFrameUrl1)),
                                 _, _, _, _, _));
+
   EXPECT_CALL(mock, OnNavigateComplete2(_, _))
       .WillOnce(testing::Return());
   EXPECT_CALL(mock, OnLoad(testing::StrEq(kSubFrameUrl1)))