Reland r62959 without the changes to histogram.cc, in hopes it won't break tab_switching_test, and without the changes to tools_sanity_unittest.cc, which have already been relanded separately.

TBR=timsteele

Original changelog message:

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

Also removes an "else" after "return" and aligns "<<" per style guide.

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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/base/event_trace_controller_win_unittest.cc b/base/event_trace_controller_win_unittest.cc
index 5777e58..1fcb616 100644
--- a/base/event_trace_controller_win_unittest.cc
+++ b/base/event_trace_controller_win_unittest.cc
@@ -120,7 +120,7 @@ TEST(EtwTraceControllerTest, StartRealTimeSession) {
 
   HRESULT hr = controller.StartRealtimeSession(kTestSessionName, 100 * 1024);
   if (hr == E_ACCESSDENIED) {
-    LOG(INFO) << "You must be an administrator to run this test on Vista";
+    VLOG(1) << "You must be an administrator to run this test on Vista";
     return;
   }
 
@@ -141,7 +141,7 @@ TEST(EtwTraceControllerTest, StartFileSession) {
   HRESULT hr = controller.StartFileSession(kTestSessionName,
                                            temp.value().c_str());
   if (hr == E_ACCESSDENIED) {
-    LOG(INFO) << "You must be an administrator to run this test on Vista";
+    VLOG(1) << "You must be an administrator to run this test on Vista";
     return;
   }
 
@@ -162,7 +162,7 @@ TEST(EtwTraceControllerTest, EnableDisable) {
   EtwTraceController controller;
   HRESULT hr = controller.StartRealtimeSession(kTestSessionName, 100 * 1024);
   if (hr == E_ACCESSDENIED) {
-    LOG(INFO) << "You must be an administrator to run this test on Vista";
+    VLOG(1) << "You must be an administrator to run this test on Vista";
     return;
   }