summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_config_service_linux.cc18
-rw-r--r--net/proxy/proxy_config_service_linux.h2
-rw-r--r--net/proxy/proxy_resolver_js_bindings.cc6
-rw-r--r--net/proxy/proxy_resolver_js_bindings.h4
-rw-r--r--net/proxy/proxy_resolver_v8_unittest.cc6
-rw-r--r--net/proxy/proxy_script_fetcher.cc8
-rw-r--r--net/proxy/proxy_service.cc4
7 files changed, 24 insertions, 24 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index b61167f..fe82e24 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -205,7 +205,7 @@ class GConfSettingGetterImplGConf
// We are on the UI thread so we can clean it safely. This is
// the case at least for ui_tests running under Valgrind in
// bug 16076.
- LOG(INFO) << "~GConfSettingGetterImplGConf: releasing gconf client";
+ VLOG(1) << "~GConfSettingGetterImplGConf: releasing gconf client";
Shutdown();
} else {
LOG(WARNING) << "~GConfSettingGetterImplGConf: leaking gconf client";
@@ -400,8 +400,8 @@ class GConfSettingGetterImplGConf
static void OnGConfChangeNotification(
GConfClient* client, guint cnxn_id,
GConfEntry* entry, gpointer user_data) {
- LOG(INFO) << "gconf change notification for key "
- << gconf_entry_get_key(entry);
+ VLOG(1) << "gconf change notification for key "
+ << gconf_entry_get_key(entry);
// We don't track which key has changed, just that something did change.
GConfSettingGetterImplGConf* setting_getter =
reinterpret_cast<GConfSettingGetterImplGConf*>(user_data);
@@ -809,7 +809,7 @@ class GConfSettingGetterImplKDE
// This is the callback from the debounce timer.
void OnDebouncedNotification() {
DCHECK(MessageLoop::current() == file_loop_);
- LOG(INFO) << "inotify change notification for kioslaverc";
+ VLOG(1) << "inotify change notification for kioslaverc";
UpdateCachedSettings();
DCHECK(notify_delegate_);
// Forward to a method on the proxy config service delegate object.
@@ -1095,7 +1095,7 @@ void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig(
// proxy setting change notifications. This should not be the usual
// case but is intended to simplify test setups.
if (!io_loop_ || !file_loop)
- LOG(INFO) << "Monitoring of proxy setting changes is disabled";
+ VLOG(1) << "Monitoring of proxy setting changes is disabled";
// Fetch and cache the current proxy config. The config is left in
// cached_config_, where GetLatestProxyConfig() running on the IO thread
@@ -1116,8 +1116,8 @@ void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig(
if (GetConfigFromGConf(&cached_config_)) {
cached_config_.set_id(1); // mark it as valid
got_config = true;
- LOG(INFO) << "Obtained proxy settings from " <<
- gconf_getter_->GetDataSource();
+ VLOG(1) << "Obtained proxy settings from "
+ << gconf_getter_->GetDataSource();
// If gconf proxy mode is "none", meaning direct, then we take
// that to be a valid config and will not check environment
// variables. The alternative would have been to look for a proxy
@@ -1141,7 +1141,7 @@ void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig(
// work.
if (GetConfigFromEnv(&cached_config_)) {
cached_config_.set_id(1); // mark it as valid
- LOG(INFO) << "Obtained proxy settings from environment variables";
+ VLOG(1) << "Obtained proxy settings from environment variables";
}
}
}
@@ -1201,7 +1201,7 @@ void ProxyConfigServiceLinux::Delegate::OnCheckProxyConfigSettings() {
void ProxyConfigServiceLinux::Delegate::SetNewProxyConfig(
const ProxyConfig& new_config) {
DCHECK(MessageLoop::current() == io_loop_);
- LOG(INFO) << "Proxy configuration changed";
+ VLOG(1) << "Proxy configuration changed";
cached_config_ = new_config;
FOR_EACH_OBSERVER(Observer, observers_, OnProxyConfigChanged(new_config));
}
diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h
index 90acbf4..07bf8fa 100644
--- a/net/proxy/proxy_config_service_linux.h
+++ b/net/proxy/proxy_config_service_linux.h
@@ -61,7 +61,7 @@ class ProxyConfigServiceLinux : public ProxyConfigService {
virtual MessageLoop* GetNotificationLoop() = 0;
// Returns the data source's name (e.g. "gconf", "KDE", "test").
- // Used only for diagnostic purposes (e.g. LOG(INFO) etc.).
+ // Used only for diagnostic purposes (e.g. VLOG(1) etc.).
virtual const char* GetDataSource() = 0;
// Gets a string type value from gconf and stores it in
diff --git a/net/proxy/proxy_resolver_js_bindings.cc b/net/proxy/proxy_resolver_js_bindings.cc
index 3888663..ae42554 100644
--- a/net/proxy/proxy_resolver_js_bindings.cc
+++ b/net/proxy/proxy_resolver_js_bindings.cc
@@ -71,7 +71,7 @@ class DefaultJSBindings : public ProxyResolverJSBindings {
// Handler for "alert(message)".
virtual void Alert(const string16& message) {
- LOG(INFO) << "PAC-alert: " << message;
+ VLOG(1) << "PAC-alert: " << message;
// Send to the NetLog.
LogEventToCurrentRequestAndGlobally(NetLog::TYPE_PAC_JAVASCRIPT_ALERT,
@@ -142,9 +142,9 @@ class DefaultJSBindings : public ProxyResolverJSBindings {
virtual void OnError(int line_number, const string16& message) {
// Send to the chrome log.
if (line_number == -1)
- LOG(INFO) << "PAC-error: " << message;
+ VLOG(1) << "PAC-error: " << message;
else
- LOG(INFO) << "PAC-error: " << "line: " << line_number << ": " << message;
+ VLOG(1) << "PAC-error: " << "line: " << line_number << ": " << message;
// Send the error to the NetLog.
LogEventToCurrentRequestAndGlobally(
diff --git a/net/proxy/proxy_resolver_js_bindings.h b/net/proxy/proxy_resolver_js_bindings.h
index cbfdb75..860be34 100644
--- a/net/proxy/proxy_resolver_js_bindings.h
+++ b/net/proxy/proxy_resolver_js_bindings.h
@@ -59,8 +59,8 @@ class ProxyResolverJSBindings {
virtual void Shutdown() = 0;
// Creates a default javascript bindings implementation that will:
- // - Send script error messages to both LOG(INFO), and the NetLog.
- // - Send script alert()s to both LOG(INFO), and the NetLog.
+ // - Send script error messages to both VLOG(1) and the NetLog.
+ // - Send script alert()s to both VLOG(1) and the NetLog.
// - Use the provided host resolver to service dnsResolve().
//
// Note that |host_resolver| will be used in sync mode mode.
diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc
index 9e4a5d7..3e61cd7 100644
--- a/net/proxy/proxy_resolver_v8_unittest.cc
+++ b/net/proxy/proxy_resolver_v8_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.
@@ -26,7 +26,7 @@ class MockJSBindings : public ProxyResolverJSBindings {
MockJSBindings() : my_ip_address_count(0), my_ip_address_ex_count(0) {}
virtual void Alert(const string16& message) {
- LOG(INFO) << "PAC-alert: " << message; // Helpful when debugging.
+ VLOG(1) << "PAC-alert: " << message; // Helpful when debugging.
alerts.push_back(UTF16ToUTF8(message));
}
@@ -57,7 +57,7 @@ class MockJSBindings : public ProxyResolverJSBindings {
virtual void OnError(int line_number, const string16& message) {
// Helpful when debugging.
- LOG(INFO) << "PAC-error: [" << line_number << "] " << message;
+ VLOG(1) << "PAC-error: [" << line_number << "] " << message;
errors.push_back(UTF16ToUTF8(message));
errors_line_number.push_back(line_number);
diff --git a/net/proxy/proxy_script_fetcher.cc b/net/proxy/proxy_script_fetcher.cc
index 0856430..c920331 100644
--- a/net/proxy/proxy_script_fetcher.cc
+++ b/net/proxy/proxy_script_fetcher.cc
@@ -293,8 +293,8 @@ void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
// NOTE about status codes: We are like Firefox 3 in this respect.
// {IE 7, Safari 3, Opera 9.5} do not care about the status code.
if (request->GetResponseCode() != 200) {
- LOG(INFO) << "Fetched PAC script had (bad) status line: "
- << request->response_headers()->GetStatusLine();
+ VLOG(1) << "Fetched PAC script had (bad) status line: "
+ << request->response_headers()->GetStatusLine();
result_code_ = ERR_PAC_STATUS_NOT_OK;
request->Cancel();
return;
@@ -306,8 +306,8 @@ void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
std::string mime_type;
cur_request_->GetMimeType(&mime_type);
if (!IsPacMimeType(mime_type)) {
- LOG(INFO) << "Fetched PAC script does not have a proper mime type: "
- << mime_type;
+ VLOG(1) << "Fetched PAC script does not have a proper mime type: "
+ << mime_type;
}
}
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 8584a25..4c27170 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -635,8 +635,8 @@ void ProxyService::OnInitProxyResolverComplete(int result) {
init_proxy_resolver_.reset();
if (result != OK) {
- LOG(INFO) << "Failed configuring with PAC script, falling-back to manual "
- "proxy servers.";
+ VLOG(1) << "Failed configuring with PAC script, falling-back to manual "
+ "proxy servers.";
config_ = fetched_config_;
config_.ClearAutomaticSettings();
}
generated by cgit v1.1 at 2025-01-24 13:02:17 +0000