summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/extensions/crx_installer.cc4
-rw-r--r--chrome/browser/extensions/execute_script_apitest.cc2
-rw-r--r--chrome/browser/extensions/extension_apitest.cc4
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc41
-rw-r--r--chrome/browser/extensions/extension_error_reporter.h2
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc4
-rw-r--r--chrome/browser/extensions/extension_updater.cc8
7 files changed, 31 insertions, 34 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 6f34b3c..8b523d5 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -263,8 +263,8 @@ void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
void CrxInstaller::ConfirmInstall() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (frontend_->extension_prefs()->IsExtensionBlacklisted(extension_->id())) {
- LOG(INFO) << "This extension: " << extension_->id()
- << " is blacklisted. Install failed.";
+ VLOG(1) << "This extension: " << extension_->id()
+ << " is blacklisted. Install failed.";
ReportFailureFromUIThread("This extension is blacklisted.");
return;
}
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index a450fe0..9edd0b6 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 20109 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.
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index d136b50..18fe7ba 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -68,7 +68,7 @@ void ExtensionApiTest::ResultCatcher::Observe(
switch (type.value) {
case NotificationType::EXTENSION_TEST_PASSED:
- LOG(INFO) << "Got EXTENSION_TEST_PASSED notification.";
+ VLOG(1) << "Got EXTENSION_TEST_PASSED notification.";
results_.push_back(true);
messages_.push_back("");
if (waiting_)
@@ -76,7 +76,7 @@ void ExtensionApiTest::ResultCatcher::Observe(
break;
case NotificationType::EXTENSION_TEST_FAILED:
- LOG(INFO) << "Got EXTENSION_TEST_FAILED notification.";
+ VLOG(1) << "Got EXTENSION_TEST_FAILED notification.";
results_.push_back(false);
messages_.push_back(*(Details<std::string>(details).ptr()));
if (waiting_)
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index aa5b46a..fb5d57b 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -142,21 +142,19 @@ bool ExtensionBrowserTest::InstallOrUpdateExtension(const std::string& id,
size_t num_after = service->extensions()->size();
if (num_after != (num_before + expected_change)) {
- LOG(INFO) << "Num extensions before: "
- << base::IntToString(num_before) << " "
- << "num after: " << base::IntToString(num_after) << " "
- << "Installed extensions follow:";
+ VLOG(1) << "Num extensions before: " << base::IntToString(num_before)
+ << " num after: " << base::IntToString(num_after)
+ << " Installed extensions follow:";
for (size_t i = 0; i < service->extensions()->size(); ++i)
- LOG(INFO) << " " << service->extensions()->at(i)->id();
+ VLOG(1) << " " << (*service->extensions())[i]->id();
- LOG(INFO) << "Errors follow:";
+ VLOG(1) << "Errors follow:";
const std::vector<std::string>* errors =
ExtensionErrorReporter::GetInstance()->GetErrors();
for (std::vector<std::string>::const_iterator iter = errors->begin();
- iter != errors->end(); ++iter) {
- LOG(INFO) << *iter;
- }
+ iter != errors->end(); ++iter)
+ VLOG(1) << *iter;
return false;
}
@@ -281,47 +279,46 @@ void ExtensionBrowserTest::Observe(NotificationType type,
switch (type.value) {
case NotificationType::EXTENSION_LOADED:
last_loaded_extension_id_ = Details<Extension>(details).ptr()->id();
- LOG(INFO) << "Got EXTENSION_LOADED notification.";
+ VLOG(1) << "Got EXTENSION_LOADED notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_UPDATE_DISABLED:
- LOG(INFO) << "Got EXTENSION_UPDATE_DISABLED notification.";
+ VLOG(1) << "Got EXTENSION_UPDATE_DISABLED notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_HOST_DID_STOP_LOADING:
- LOG(INFO) << "Got EXTENSION_HOST_DID_STOP_LOADING notification.";
+ VLOG(1) << "Got EXTENSION_HOST_DID_STOP_LOADING notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_INSTALLED:
- LOG(INFO) << "Got EXTENSION_INSTALLED notification.";
+ VLOG(1) << "Got EXTENSION_INSTALLED notification.";
++extension_installs_observed_;
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_INSTALL_ERROR:
- LOG(INFO) << "Got EXTENSION_INSTALL_ERROR notification.";
+ VLOG(1) << "Got EXTENSION_INSTALL_ERROR notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_PROCESS_CREATED:
- LOG(INFO) << "Got EXTENSION_PROCESS_CREATED notification.";
+ VLOG(1) << "Got EXTENSION_PROCESS_CREATED notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_PROCESS_TERMINATED:
- LOG(INFO) << "Got EXTENSION_PROCESS_TERMINATED notification.";
+ VLOG(1) << "Got EXTENSION_PROCESS_TERMINATED notification.";
MessageLoopForUI::current()->Quit();
break;
case NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED: {
LocationBarTesting* location_bar =
browser()->window()->GetLocationBar()->GetLocationBarForTesting();
- LOG(INFO) << "Got EXTENSION_PAGE_ACTION_COUNT_CHANGED "
- << "notification. Number of page actions: "
- << location_bar->PageActionCount() << "";
+ VLOG(1) << "Got EXTENSION_PAGE_ACTION_COUNT_CHANGED notification. Number "
+ "of page actions: " << location_bar->PageActionCount();
if (location_bar->PageActionCount() ==
target_page_action_count_) {
target_page_action_count_ = -1;
@@ -333,9 +330,9 @@ void ExtensionBrowserTest::Observe(NotificationType type,
case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
LocationBarTesting* location_bar =
browser()->window()->GetLocationBar()->GetLocationBarForTesting();
- LOG(INFO) << "Got EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED "
- << "notification. Number of visible page actions: "
- << location_bar->PageActionVisibleCount();
+ VLOG(1) << "Got EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED notification. "
+ "Number of visible page actions: "
+ << location_bar->PageActionVisibleCount();
if (location_bar->PageActionVisibleCount() ==
target_visible_page_action_count_) {
target_visible_page_action_count_ = -1;
diff --git a/chrome/browser/extensions/extension_error_reporter.h b/chrome/browser/extensions/extension_error_reporter.h
index 2866211..8753c39 100644
--- a/chrome/browser/extensions/extension_error_reporter.h
+++ b/chrome/browser/extensions/extension_error_reporter.h
@@ -28,7 +28,7 @@ class ExtensionErrorReporter {
// Get the singleton instance.
static ExtensionErrorReporter* GetInstance();
- // Report an error. Errors always go to LOG(INFO). Optionally, they can also
+ // Report an error. Errors always go to VLOG(1). Optionally, they can also
// cause a noisy alert box. This method can be called from any thread.
void ReportError(const std::string& message, bool be_noisy);
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 8da37de..76b001a 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -942,7 +942,7 @@ bool CaptureVisibleTabFunction::CaptureSnapshotFromBackingStore(
&temp_canvas)) {
return false;
}
- LOG(INFO) << "captureVisibleTab() Got image from backing store.";
+ VLOG(1) << "captureVisibleTab() got image from backing store.";
SendResultFromBitmap(
temp_canvas.getTopPlatformDevice().accessBitmap(false));
@@ -964,7 +964,7 @@ void CaptureVisibleTabFunction::Observe(NotificationType type,
error_ = keys::kInternalVisibleTabCaptureError;
SendResponse(false);
} else {
- LOG(INFO) << "captureVisibleTab() Got image from renderer.";
+ VLOG(1) << "captureVisibleTab() got image from renderer.";
SendResultFromBitmap(*screen_capture);
}
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index f4e9e94..0af7600 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -525,8 +525,8 @@ void ExtensionUpdater::OnManifestFetchComplete(const GURL& url,
safe_parser->Start();
} else {
// TODO(asargent) Do exponential backoff here. (http://crbug.com/12546).
- LOG(INFO) << "Failed to fetch manifest '" << url.possibly_invalid_spec() <<
- "' response code:" << response_code;
+ VLOG(1) << "Failed to fetch manifest '" << url.possibly_invalid_spec()
+ << "' response code:" << response_code;
}
manifest_fetcher_.reset();
current_manifest_fetch_.reset();
@@ -620,8 +620,8 @@ void ExtensionUpdater::OnCRXFetchComplete(const GURL& url,
// TODO(asargent) do things like exponential backoff, handling
// 503 Service Unavailable / Retry-After headers, etc. here.
// (http://crbug.com/12546).
- LOG(INFO) << "Failed to fetch extension '" <<
- url.possibly_invalid_spec() << "' response code:" << response_code;
+ VLOG(1) << "Failed to fetch extension '" << url.possibly_invalid_spec()
+ << "' response code:" << response_code;
}
extension_fetcher_.reset();
current_extension_fetch_ = ExtensionFetch();