From 4fb42cfd8ddb98e6dad9955c43683cb5558a2a94 Mon Sep 17 00:00:00 2001
From: "pkasting@chromium.org"
<pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 Oct 2010 16:13:19 +0000
Subject: Convert LOG(INFO) to VLOG(1) - chrome/browser/net/.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4007001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63517 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/net/gaia/token_service.cc | 5 +-
chrome/browser/net/net_log_logger.cc | 2 +-
chrome/browser/net/net_log_logger.h | 2 +-
chrome/browser/net/url_info.cc | 8 ++--
.../websocket_experiment_runner.cc | 2 +-
.../websocket_experiment_task.cc | 54 +++++++++++-----------
6 files changed, 35 insertions(+), 38 deletions(-)
(limited to 'chrome/browser/net')
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc
index 963b546..b79af64 100644
--- a/chrome/browser/net/gaia/token_service.cc
+++ b/chrome/browser/net/gaia/token_service.cc
@@ -184,7 +184,7 @@ void TokenService::IssueAuthTokenForTest(const std::string& service,
void TokenService::OnIssueAuthTokenSuccess(const std::string& service,
const std::string& auth_token) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- LOG(INFO) << "Got an authorization token for " << service;
+ VLOG(1) << "Got an authorization token for " << service;
token_map_[service] = auth_token;
FireTokenAvailableNotification(service, auth_token);
SaveAuthTokenToDB(service, auth_token);
@@ -237,8 +237,7 @@ void TokenService::LoadTokensIntoMemory(
db_tokens.count(kServices[i])) {
std::string db_token = db_tokens.find(kServices[i])->second;
if (!db_token.empty()) {
- LOG(INFO) << "Loading " << kServices[i] << "token from DB:"
- << db_token;
+ VLOG(1) << "Loading " << kServices[i] << "token from DB: " << db_token;
(*in_memory_tokens)[kServices[i]] = db_token;
FireTokenAvailableNotification(kServices[i], db_token);
// Failures are only for network errors.
diff --git a/chrome/browser/net/net_log_logger.cc b/chrome/browser/net/net_log_logger.cc
index 5db7657..b533e95 100644
--- a/chrome/browser/net/net_log_logger.cc
+++ b/chrome/browser/net/net_log_logger.cc
@@ -21,6 +21,6 @@ void NetLogLogger::OnAddEntry(net::NetLog::EventType type,
params, true));
std::string json;
base::JSONWriter::Write(value.get(), true, &json);
- LOG(INFO) << json;
+ VLOG(1) << json;
}
diff --git a/chrome/browser/net/net_log_logger.h b/chrome/browser/net/net_log_logger.h
index 98c989e..7f90d94 100644
--- a/chrome/browser/net/net_log_logger.h
+++ b/chrome/browser/net/net_log_logger.h
@@ -9,7 +9,7 @@
#include "chrome/browser/net/chrome_net_log.h"
// NetLogLogger watches the NetLog event stream, and sends all entries to
-// LOG(INFO). This is to debug errors that prevent getting to the
+// VLOG(1). This is to debug errors that prevent getting to the
// about:net-internals page.
class NetLogLogger : public ChromeNetLog::Observer {
public:
diff --git a/chrome/browser/net/url_info.cc b/chrome/browser/net/url_info.cc
index c383359..505425a 100644
--- a/chrome/browser/net/url_info.cc
+++ b/chrome/browser/net/url_info.cc
@@ -183,11 +183,9 @@ bool UrlInfo::IsStillCached() const {
void UrlInfo::DLogResultsStats(const char* message) const {
if (!detailed_logging_enabled)
return;
- DLOG(INFO) << "\t" << message << "\tq="
- << queue_duration().InMilliseconds() << "ms,\tr="
- << resolve_duration().InMilliseconds() << "ms\tp="
- << sequence_number_
- << "\t" << url_.spec();
+ DVLOG(1) << "\t" << message << "\tq=" << queue_duration().InMilliseconds()
+ << "ms,\tr=" << resolve_duration().InMilliseconds()
+ << "ms,\tp=" << sequence_number_ << "\t" << url_.spec();
}
//------------------------------------------------------------------------------
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
index 18f31df..9c0ab55 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_runner.cc
@@ -222,7 +222,7 @@ void WebSocketExperimentRunner::OnTaskCompleted(int result) {
if (next_state_ == STATE_NONE) {
task_.reset();
// Task is Canceled.
- DLOG(INFO) << "WebSocketExperiment Task is canceled.";
+ DVLOG(1) << "WebSocketExperiment Task is canceled.";
Release();
return;
}
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index 6279615..05b2315 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.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.
@@ -235,8 +235,8 @@ void WebSocketExperimentTask::ReleaseHistogram() {
}
void WebSocketExperimentTask::Run() {
- DLOG(INFO) << "Run WebSocket experiment for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version);
+ DVLOG(1) << "Run WebSocket experiment for " << config_.url << " "
+ << GetProtocolVersionName(config_.protocol_version);
next_state_ = STATE_URL_FETCH;
DoLoop(net::OK);
}
@@ -247,8 +247,8 @@ void WebSocketExperimentTask::Cancel() {
}
void WebSocketExperimentTask::SaveResult() const {
- DLOG(INFO) << "WebSocket experiment save result for " << config_.url
- << " last_state=" << result_.last_state;
+ DVLOG(1) << "WebSocket experiment save result for " << config_.url
+ << " last_state=" << result_.last_state;
UpdateHistogramEnums(config_, "LastState", result_.last_state, NUM_STATES);
UpdateHistogramTimes(config_, "UrlFetch", result_.url_fetch,
base::TimeDelta::FromMilliseconds(1),
@@ -303,8 +303,8 @@ void WebSocketExperimentTask::OnURLFetchComplete(
RevokeTimeoutTimer();
int result = net::ERR_FAILED;
if (next_state_ != STATE_URL_FETCH_COMPLETE) {
- DLOG(INFO) << "unexpected state=" << next_state_
- << " at OnURLFetchComplete for " << config_.http_url;
+ DVLOG(1) << "unexpected state=" << next_state_
+ << " at OnURLFetchComplete for " << config_.http_url;
result = net::ERR_UNEXPECTED;
} else if (response_code == 200 || response_code == 304) {
result = net::OK;
@@ -321,9 +321,9 @@ void WebSocketExperimentTask::OnOpen(net::WebSocket* websocket) {
if (next_state_ == STATE_WEBSOCKET_CONNECT_COMPLETE)
result = net::OK;
else
- DLOG(INFO) << "unexpected state=" << next_state_
- << " at OnOpen for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version);
+ DVLOG(1) << "unexpected state=" << next_state_
+ << " at OnOpen for " << config_.url
+ << " " << GetProtocolVersionName(config_.protocol_version);
DoLoop(result);
}
@@ -346,9 +346,9 @@ void WebSocketExperimentTask::OnMessage(
result = net::OK;
break;
default:
- DLOG(INFO) << "unexpected state=" << next_state_
- << " at OnMessage for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version);
+ DVLOG(1) << "unexpected state=" << next_state_
+ << " at OnMessage for " << config_.url
+ << " " << GetProtocolVersionName(config_.protocol_version);
break;
}
DoLoop(result);
@@ -367,9 +367,9 @@ void WebSocketExperimentTask::OnClose(
int result = net::ERR_CONNECTION_CLOSED;
if (last_websocket_error_ != net::OK)
result = last_websocket_error_;
- DLOG(INFO) << "WebSocket onclose was_clean=" << was_clean
- << " next_state=" << next_state_
- << " last_error=" << net::ErrorToString(result);
+ DVLOG(1) << "WebSocket onclose was_clean=" << was_clean
+ << " next_state=" << next_state_
+ << " last_error=" << net::ErrorToString(result);
if (config_.protocol_version == net::WebSocket::DEFAULT_VERSION) {
if (next_state_ == STATE_WEBSOCKET_CLOSE_COMPLETE && was_clean)
result = net::OK;
@@ -383,10 +383,10 @@ void WebSocketExperimentTask::OnClose(
void WebSocketExperimentTask::OnSocketError(
const net::WebSocket* websocket, int error) {
- DLOG(INFO) << "WebSocket socket level error=" << net::ErrorToString(error)
- << " next_state=" << next_state_
- << " for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version);
+ DVLOG(1) << "WebSocket socket level error=" << net::ErrorToString(error)
+ << " next_state=" << next_state_
+ << " for " << config_.url
+ << " " << GetProtocolVersionName(config_.protocol_version);
last_websocket_error_ = error;
}
@@ -395,9 +395,9 @@ void WebSocketExperimentTask::SetContext(Context* context) {
}
void WebSocketExperimentTask::OnTimedOut() {
- DLOG(INFO) << "OnTimedOut next_state=" << next_state_
- << " for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version);
+ DVLOG(1) << "OnTimedOut next_state=" << next_state_
+ << " for " << config_.url
+ << " " << GetProtocolVersionName(config_.protocol_version);
RevokeTimeoutTimer();
DoLoop(net::ERR_TIMED_OUT);
}
@@ -644,10 +644,10 @@ void WebSocketExperimentTask::Finish(int result) {
websocket_ = NULL;
if (websocket)
websocket->DetachDelegate();
- DLOG(INFO) << "Finish WebSocket experiment for " << config_.url
- << " " << GetProtocolVersionName(config_.protocol_version)
- << " next_state=" << next_state_
- << " result=" << net::ErrorToString(result);
+ DVLOG(1) << "Finish WebSocket experiment for " << config_.url
+ << " " << GetProtocolVersionName(config_.protocol_version)
+ << " next_state=" << next_state_
+ << " result=" << net::ErrorToString(result);
callback_->Run(result); // will release this.
}
--
cgit v1.1