Convert LOG(INFO) to VLOG(1) - chrome_frame/.

Plus a couple misc. cleanups.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3850002

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

10 files changed, 48 insertions, 44 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 99fedd2..7d6a28b 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -554,8 +554,8 @@ bool DetectRunningCrashService(int timeout_ms) {
 
 base::ProcessHandle StartCrashService() {
   if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
-    DLOG(INFO) << "crash_service.exe is already running. We will use the "
-               << "existing process and leave it running after tests complete.";
+    DVLOG(1) << "crash_service.exe is already running. We will use the "
+                "existing process and leave it running after tests complete.";
     return NULL;
   }
 
@@ -567,7 +567,7 @@ base::ProcessHandle StartCrashService() {
 
   base::ProcessHandle crash_service = NULL;
 
-  DLOG(INFO) << "Starting crash_service.exe so you know if a test crashes!";
+  DVLOG(1) << "Starting crash_service.exe so you know if a test crashes!";
 
   FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe");
   if (!base::LaunchApp(crash_service_path.value(), false, false,
@@ -579,13 +579,13 @@ base::ProcessHandle StartCrashService() {
   base::Time start = base::Time::Now();
 
   if (DetectRunningCrashService(kCrashServiceStartupTimeoutMs)) {
-    DLOG(INFO) << "crash_service.exe is ready for clients in "
-               << (base::Time::Now() - start).InMilliseconds() << "ms.";
+    DVLOG(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.";
+                   "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.
diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc
index 8de7d8e..09bbfbd 100644
--- a/chrome_frame/test/chrome_frame_ui_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc
@@ -536,7 +536,7 @@ bool AccObjectMatcher::FindInWindow(HWND hwnd,
                                     scoped_refptr<AccObject>* match) const {
   scoped_refptr<AccObject> object(AccObject::CreateFromWindow(hwnd));
   if (!object) {
-    LOG(INFO) << "Failed to get accessible object from window";
+    VLOG(1) << "Failed to get accessible object from window";
     return false;
   }
   return Find(object.get(), match);
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc
index 0ef8a43..e34e963 100644
--- a/chrome_frame/test/http_negotiate_unittest.cc
+++ b/chrome_frame/test/http_negotiate_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -186,7 +186,7 @@ END_COM_MAP()
 
 TEST_F(HttpNegotiateTest, ReportProgress) {
   if (chrome_frame_test::GetInstalledIEVersion() == IE_6) {
-    DLOG(INFO) << "Not running test for IE6";
+    DVLOG(1) << "Not running test for IE6";
     return;
   }
   static const int kReportProgressIndex = 4;
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 85bebb88..50d33b5 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -421,7 +421,7 @@ STDMETHODIMP_(void) IEEventSink::OnNewWindow2(IDispatch** disp,
 
 STDMETHODIMP_(void) IEEventSink::OnNavigateError(IDispatch* dispatch,
     VARIANT* url, VARIANT* frame_name, VARIANT* status_code, VARIANT* cancel) {
-  DLOG(INFO) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__;
   if (listener_)
     listener_->OnNavigateError(dispatch, url, frame_name, status_code, cancel);
 }
@@ -430,8 +430,8 @@ STDMETHODIMP IEEventSink::OnBeforeNavigate2(
     IDispatch* dispatch, VARIANT* url, VARIANT* flags,
     VARIANT* target_frame_name, VARIANT* post_data, VARIANT* headers,
     VARIANT_BOOL* cancel) {
-  DLOG(INFO) << __FUNCTION__
-      << base::StringPrintf("%ls - 0x%08X", url->bstrVal, this);
+  DVLOG(1) << __FUNCTION__
+           << base::StringPrintf("%ls - 0x%08X", url->bstrVal, this);
   // Reset any existing reference to chrome frame since this is a new
   // navigation.
   DisconnectFromChromeFrame();
@@ -443,7 +443,7 @@ STDMETHODIMP IEEventSink::OnBeforeNavigate2(
 
 STDMETHODIMP_(void) IEEventSink::OnNavigateComplete2(
     IDispatch* dispatch, VARIANT* url) {
-  DLOG(INFO) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__;
   ConnectToChromeFrame();
   if (listener_)
     listener_->OnNavigateComplete2(dispatch, url);
@@ -451,7 +451,7 @@ STDMETHODIMP_(void) IEEventSink::OnNavigateComplete2(
 
 STDMETHODIMP_(void) IEEventSink::OnDocumentComplete(
     IDispatch* dispatch, VARIANT* url) {
-  DLOG(INFO) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__;
   EXPECT_TRUE(url);
   if (!url)
     return;
@@ -461,8 +461,8 @@ STDMETHODIMP_(void) IEEventSink::OnDocumentComplete(
 
 STDMETHODIMP_(void) IEEventSink::OnFileDownload(
     VARIANT_BOOL active_doc, VARIANT_BOOL* cancel) {
-  DLOG(INFO) << __FUNCTION__ << base::StringPrintf(" 0x%08X ad=%i", this,
-                                                   active_doc);
+  DVLOG(1) << __FUNCTION__
+           << base::StringPrintf(" 0x%08X ad=%i", this, active_doc);
   if (listener_) {
     listener_->OnFileDownload(active_doc, cancel);
   } else {
@@ -473,7 +473,7 @@ STDMETHODIMP_(void) IEEventSink::OnFileDownload(
 STDMETHODIMP_(void) IEEventSink::OnNewWindow3(
     IDispatch** dispatch, VARIANT_BOOL* cancel, DWORD flags, BSTR url_context,
     BSTR url) {
-  DLOG(INFO) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__;
   EXPECT_TRUE(dispatch);
   if (!dispatch)
     return;
@@ -498,7 +498,7 @@ STDMETHODIMP_(void) IEEventSink::OnNewWindow3(
 }
 
 STDMETHODIMP_(void) IEEventSink::OnQuit() {
-  DLOG(INFO) << __FUNCTION__;
+  DVLOG(1) << __FUNCTION__;
 
   did_receive_on_quit_ = true;
 
@@ -510,7 +510,7 @@ STDMETHODIMP_(void) IEEventSink::OnQuit() {
 }
 
 HRESULT IEEventSink::OnLoad(const VARIANT* param) {
-  DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+  DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
   ScopedVariant stack_object(*param);
   if (chrome_frame_) {
     if (listener_)
@@ -522,7 +522,7 @@ HRESULT IEEventSink::OnLoad(const VARIANT* param) {
 }
 
 HRESULT IEEventSink::OnLoadError(const VARIANT* param) {
-  DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+  DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
   if (chrome_frame_) {
     if (listener_)
       listener_->OnLoadError(param->bstrVal);
@@ -533,7 +533,7 @@ HRESULT IEEventSink::OnLoadError(const VARIANT* param) {
 }
 
 HRESULT IEEventSink::OnMessage(const VARIANT* param) {
-  DLOG(INFO) << __FUNCTION__ << " " << param;
+  DVLOG(1) << __FUNCTION__ << " " << param;
   if (!chrome_frame_.get()) {
     DLOG(WARNING) << "Invalid chrome frame pointer";
     return S_OK;
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index fd21317..d65e026 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -214,10 +214,14 @@ END_SINK_MAP()
   STDMETHOD_(void, OnQuit)();
 
 #ifdef _DEBUG
-  STDMETHOD(Invoke)(DISPID dispid, REFIID riid,
-    LCID lcid, WORD flags, DISPPARAMS* params, VARIANT* result,
-    EXCEPINFO* except_info, UINT* arg_error) {
-    DLOG(INFO) << __FUNCTION__ << L" disp id :"  << dispid;
+  STDMETHOD(Invoke)(DISPID dispid,
+                    REFIID riid, LCID lcid,
+                    WORD flags,
+                    DISPPARAMS* params,
+                    VARIANT* result,
+                    EXCEPINFO* except_info,
+                    UINT* arg_error) {
+    DVLOG(1) << __FUNCTION__ << L" disp id :"  << dispid;
     return DispEventsImpl::Invoke(dispid, riid, lcid, flags, params, result,
                                   except_info, arg_error);
   }
diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc
index cb77efa..98119ed 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.cc
+++ b/chrome_frame/test/mock_ie_event_sink_test.cc
@@ -32,7 +32,7 @@ void MockIEEventSink::OnDocumentComplete(IDispatch* dispatch, VARIANT* url) {
                        renderer_window,
                        OBJID_CLIENT, 0L);
     } else {
-      DLOG(INFO) << "Browser does not have renderer window";
+      DVLOG(1) << "Browser does not have renderer window";
     }
     OnLoad(IN_IE, V_BSTR(url));
   }
@@ -62,8 +62,8 @@ ExpectationSet MockIEEventSink::ExpectNavigationCardinality(
   // InSequence.
   DLOG_IF(WARNING, complete_cardinality.ConservativeUpperBound() > 1000)
       << "Cardinality upper bound may be too great to be split up into single "
-      << "expect statements. If you do not require this navigation to be in "
-      << "sequence, do not call this method.";
+         "expect statements. If you do not require this navigation to be in "
+         "sequence, do not call this method.";
   int call_count = 0;
   InSequence expect_in_sequence_for_scope;
   while (!complete_cardinality.IsSaturatedByCallCount(call_count)) {
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index db89bc2..322bf87 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -60,7 +60,7 @@ bool TestAutomationProvider::Send(IPC::Message* msg) {
     DCHECK(tab_handle_ == -1) << "Currently only support one tab";
     void* iter = NULL;
     CHECK(msg->ReadInt(&iter, &tab_handle_));
-    DLOG(INFO) << "Got tab handle: " << tab_handle_;
+    DVLOG(1) << "Got tab handle: " << tab_handle_;
     DCHECK(tab_handle_ != -1 && tab_handle_ != 0);
     delegate_->OnInitialTabLoaded();
   }
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 34c1183..08dbdf2 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -72,19 +72,19 @@ class ChromeFrameActiveXContainer
   END_MSG_MAP()
 
   HRESULT OnMessageCallback(const VARIANT* param) {
-    DLOG(INFO) << __FUNCTION__;
+    DVLOG(1) << __FUNCTION__;
     OnMessageCallbackImpl(param);
     return S_OK;
   }
 
   HRESULT OnLoadErrorCallback(const VARIANT* param) {
-    DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+    DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
     OnLoadErrorCallbackImpl(param);
     return S_OK;
   }
 
   HRESULT OnLoadCallback(const VARIANT* param) {
-    DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+    DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
     OnLoadCallbackImpl(param);
     return S_OK;
   }
@@ -464,7 +464,7 @@ class ChromeFrameStartupTestActiveXReference
 
     chrome_frame_dll_ = FilePath(
         chrome_frame_registrar_->GetReferenceChromeFrameDllPath());
-    DLOG(INFO) << __FUNCTION__ << ": " << chrome_frame_dll_.value();
+    DVLOG(1) << __FUNCTION__ << ": " << chrome_frame_dll_.value();
   }
 
   virtual void TearDown() {
@@ -593,7 +593,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase {
     ASSERT_TRUE(param != NULL);
     ASSERT_EQ(VT_BSTR, param->vt);
 
-    DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+    DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
     InitiateNextNavigation();
   }
 
@@ -601,7 +601,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase {
     ASSERT_TRUE(param != NULL);
     ASSERT_EQ(VT_BSTR, param->vt);
 
-    DLOG(INFO) << __FUNCTION__ << " " << param->bstrVal;
+    DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
     InitiateNextNavigation();
   }
 
diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc
index 4493300..98792e2 100644
--- a/chrome_frame/test/test_server.cc
+++ b/chrome_frame/test/test_server.cc
@@ -314,8 +314,8 @@ void ConfigurableConnection::SendChunk() {
   int bytes_to_send = std::min(options_.chunk_size_, size - cur_pos_);
 
   socket_->Send(chunk_ptr, bytes_to_send);
-  DLOG(INFO) << "Sent(" << cur_pos_ << "," << bytes_to_send
-      << "): " << base::StringPiece(chunk_ptr, bytes_to_send);
+  DVLOG(1) << "Sent(" << cur_pos_ << "," << bytes_to_send << "): "
+           << base::StringPiece(chunk_ptr, bytes_to_send);
 
   cur_pos_ += bytes_to_send;
   if (cur_pos_ < size) {
@@ -356,7 +356,7 @@ void ConfigurableConnection::SendWithOptions(const std::string& headers,
   if (options_.speed_ == SendOptions::IMMEDIATE_HEADERS_DELAYED_CONTENT) {
     socket_->Send(headers);
     socket_->Send(content_length_header, true);
-    DLOG(INFO) << "Headers sent: " << headers << content_length_header;
+    DVLOG(1) << "Headers sent: " << headers << content_length_header;
     data_.append(content);
   }
 
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 29b3831..1174cab 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -355,8 +355,8 @@ void MockWebServer::SendResponseHelper(
                                                              headers);
     } else {
       EXPECT_TRUE(net::GetMimeTypeFromFile(file_path, &content_type));
-      DLOG(INFO) << "Going to send file (" << WideToUTF8(file_path.value())
-                 << ") with content type (" << content_type << ")";
+      DVLOG(1) << "Going to send file (" << WideToUTF8(file_path.value())
+               << ") with content type (" << content_type << ")";
       headers = CreateHttpHeaders(invocation, add_no_cache_header,
                                   content_type);
     }
@@ -371,8 +371,8 @@ void MockWebServer::SendResponseHelper(
           << "meta tag to HTML file.";
     }
   } else {
-    DLOG(INFO) << "Going to send 404 for non-existent file ("
-               << WideToUTF8(file_path.value()) << ")";
+    DVLOG(1) << "Going to send 404 for non-existent file ("
+             << WideToUTF8(file_path.value()) << ")";
     headers = "HTTP/1.1 404 Not Found";
     body = "";
   }