summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:41:46 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:41:46 +0000
commit211fabeb83cdf05fe34daa2e65e967579cf659dc (patch)
tree6e6d3f43a34ebfd684f65b4cb69df9a323464222 /chrome/browser/sync
parent18cca2018b2159c6efdde226d1c2695aba4a62aa (diff)
downloadchromium_src-211fabeb83cdf05fe34daa2e65e967579cf659dc.zip
chromium_src-211fabeb83cdf05fe34daa2e65e967579cf659dc.tar.gz
chromium_src-211fabeb83cdf05fe34daa2e65e967579cf659dc.tar.bz2
Convert LOG(INFO) to VLOG(1) - chrome/browser/sync/glue/.
BUG=none TEST=none Review URL: http://codereview.chromium.org/4004002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/glue/autofill_data_type_controller.cc14
-rw-r--r--chrome/browser/sync/glue/autofill_model_associator.cc2
-rw-r--r--chrome/browser/sync/glue/data_type_manager_impl.cc18
-rw-r--r--chrome/browser/sync/glue/extension_change_processor.cc10
-rw-r--r--chrome/browser/sync/glue/theme_change_processor.cc20
-rw-r--r--chrome/browser/sync/glue/theme_util.cc7
-rw-r--r--chrome/browser/sync/glue/typed_url_change_processor.cc2
-rw-r--r--chrome/browser/sync/glue/typed_url_data_type_controller.cc14
-rw-r--r--chrome/browser/sync/glue/typed_url_model_associator.cc2
9 files changed, 44 insertions, 45 deletions
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index 8c33872..4585101 100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
@@ -41,7 +41,7 @@ AutofillDataTypeController::~AutofillDataTypeController() {
}
void AutofillDataTypeController::Start(StartCallback* start_callback) {
- LOG(INFO) << "Starting autofill data controller.";
+ VLOG(1) << "Starting autofill data controller.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(start_callback);
if (state() != NOT_RUNNING) {
@@ -90,7 +90,7 @@ void AutofillDataTypeController::OnPersonalDataLoaded() {
void AutofillDataTypeController::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
- LOG(INFO) << "Web database loaded observed.";
+ VLOG(1) << "Web database loaded observed.";
notification_registrar_.RemoveAll();
set_state(ASSOCIATING);
BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
@@ -100,7 +100,7 @@ void AutofillDataTypeController::Observe(NotificationType type,
}
void AutofillDataTypeController::Stop() {
- LOG(INFO) << "Stopping autofill data type controller.";
+ VLOG(1) << "Stopping autofill data type controller.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// If Stop() is called while Start() is waiting for association to
@@ -143,7 +143,7 @@ void AutofillDataTypeController::Stop() {
}
void AutofillDataTypeController::StartImpl() {
- LOG(INFO) << "Autofill data type controller StartImpl called.";
+ VLOG(1) << "Autofill data type controller StartImpl called.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
// No additional services need to be started before we can proceed
// with model association.
@@ -185,7 +185,7 @@ void AutofillDataTypeController::StartImpl() {
void AutofillDataTypeController::StartDone(
DataTypeController::StartResult result,
DataTypeController::State new_state) {
- LOG(INFO) << "Autofill data type controller StartDone called.";
+ VLOG(1) << "Autofill data type controller StartDone called.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
abort_association_complete_.Signal();
@@ -203,7 +203,7 @@ void AutofillDataTypeController::StartDone(
void AutofillDataTypeController::StartDoneImpl(
DataTypeController::StartResult result,
DataTypeController::State new_state) {
- LOG(INFO) << "Autofill data type controller StartDoneImpl called.";
+ VLOG(1) << "Autofill data type controller StartDoneImpl called.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
set_state(new_state);
@@ -218,7 +218,7 @@ void AutofillDataTypeController::StartDoneImpl(
}
void AutofillDataTypeController::StopImpl() {
- LOG(INFO) << "Autofill data type controller StopImpl called.";
+ VLOG(1) << "Autofill data type controller StopImpl called.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
change_processor_.reset();
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
index 9efa191..43914c2 100644
--- a/chrome/browser/sync/glue/autofill_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc
@@ -217,7 +217,7 @@ bool AutofillModelAssociator::LoadAutofillData(
}
bool AutofillModelAssociator::AssociateModels() {
- LOG(INFO) << "Associating Autofill Models";
+ VLOG(1) << "Associating Autofill Models";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
{
AutoLock lock(abort_association_pending_lock_);
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index 8cf50e0..af980fa 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -91,7 +91,7 @@ void DataTypeManagerImpl::Configure(const TypeSet& desired_types) {
(dtc->second->state() == DataTypeController::NOT_RUNNING ||
dtc->second->state() == DataTypeController::STOPPING)) {
needs_start_.push_back(dtc->second.get());
- LOG(INFO) << "Will start " << dtc->second->name();
+ VLOG(1) << "Will start " << dtc->second->name();
}
}
// Sort these according to kStartOrder.
@@ -110,7 +110,7 @@ void DataTypeManagerImpl::Configure(const TypeSet& desired_types) {
dtc->state() == DataTypeController::ASSOCIATING ||
dtc->state() == DataTypeController::RUNNING)) {
needs_stop_.push_back(dtc);
- LOG(INFO) << "Will stop " << dtc->name();
+ VLOG(1) << "Will stop " << dtc->name();
}
}
// Sort these according to kStartOrder.
@@ -130,7 +130,7 @@ void DataTypeManagerImpl::Configure(const TypeSet& desired_types) {
}
void DataTypeManagerImpl::Restart() {
- LOG(INFO) << "Restarting...";
+ VLOG(1) << "Restarting...";
// If we are currently waiting for an asynchronous process to
// complete, change our state to RESTARTING so those processes know
// that we want to start over when they finish.
@@ -150,7 +150,7 @@ void DataTypeManagerImpl::Restart() {
// Stop requested data types.
for (size_t i = 0; i < needs_stop_.size(); ++i) {
- LOG(INFO) << "Stopping " << needs_stop_[i]->name();
+ VLOG(1) << "Stopping " << needs_stop_[i]->name();
needs_stop_[i]->Stop();
}
needs_stop_.clear();
@@ -211,7 +211,7 @@ void DataTypeManagerImpl::StartNextType() {
// front of the list.
if (needs_start_.size() > 0) {
current_dtc_ = needs_start_[0];
- LOG(INFO) << "Starting " << current_dtc_->name();
+ VLOG(1) << "Starting " << current_dtc_->name();
current_dtc_->Start(
NewCallback(this, &DataTypeManagerImpl::TypeStartCallback));
return;
@@ -264,7 +264,7 @@ void DataTypeManagerImpl::TypeStartCallback(
// If the type is waiting for the cryptographer, continue to the next type.
// Once the cryptographer is ready, we'll attempt to restart this type.
if (result == DataTypeController::NEEDS_CRYPTO) {
- LOG(INFO) << "Waiting for crypto " << started_dtc->name();
+ VLOG(1) << "Waiting for crypto " << started_dtc->name();
StartNextType();
return;
}
@@ -272,7 +272,7 @@ void DataTypeManagerImpl::TypeStartCallback(
// If the type started normally, continue to the next type.
if (result == DataTypeController::OK ||
result == DataTypeController::OK_FIRST_RUN) {
- LOG(INFO) << "Started " << started_dtc->name();
+ VLOG(1) << "Started " << started_dtc->name();
StartNextType();
return;
}
@@ -280,7 +280,7 @@ void DataTypeManagerImpl::TypeStartCallback(
// Any other result is a fatal error. Shut down any types we've
// managed to start up to this point and pass the result to the
// callback.
- LOG(INFO) << "Failed " << started_dtc->name();
+ VLOG(1) << "Failed " << started_dtc->name();
ConfigureResult configure_result = DataTypeManager::ABORTED;
switch (result) {
case DataTypeController::ABORTED:
@@ -350,7 +350,7 @@ void DataTypeManagerImpl::FinishStop() {
DataTypeController* dtc = (*it).second;
if (dtc->state() == DataTypeController::RUNNING) {
dtc->Stop();
- LOG(INFO) << "Stopped " << dtc->name();
+ VLOG(1) << "Stopped " << dtc->name();
}
}
state_ = STOPPED;
diff --git a/chrome/browser/sync/glue/extension_change_processor.cc b/chrome/browser/sync/glue/extension_change_processor.cc
index fefae93..0cc64a9 100644
--- a/chrome/browser/sync/glue/extension_change_processor.cc
+++ b/chrome/browser/sync/glue/extension_change_processor.cc
@@ -66,15 +66,15 @@ void ExtensionChangeProcessor::Observe(NotificationType type,
*uninstalled_extension_info);
if (ContainsKey(traits_.allowed_extension_types, extension_type)) {
const std::string& id = uninstalled_extension_info->extension_id;
- LOG(INFO) << "Removing server data for uninstalled extension "
- << id << " of type " << extension_type;
+ VLOG(1) << "Removing server data for uninstalled extension " << id
+ << " of type " << extension_type;
RemoveServerData(traits_, id, profile_->GetProfileSyncService());
}
} else {
const Extension* extension = Details<Extension>(details).ptr();
CHECK(extension);
- LOG(INFO) << "Updating server data for extension " << extension->id()
- << " (notification type = " << type.value << ")";
+ VLOG(1) << "Updating server data for extension " << extension->id()
+ << " (notification type = " << type.value << ")";
// Ignore non-syncable extensions.
if (!IsExtensionValidAndSyncable(
*extension, traits_.allowed_extension_types)) {
@@ -189,7 +189,7 @@ void ExtensionChangeProcessor::StartObserving() {
void ExtensionChangeProcessor::StopObserving() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(profile_);
- LOG(INFO) << "Unobserving all notifications";
+ VLOG(1) << "Unobserving all notifications";
notification_registrar_.RemoveAll();
}
diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc
index bdf5e47..e22484c 100644
--- a/chrome/browser/sync/glue/theme_change_processor.cc
+++ b/chrome/browser/sync/glue/theme_change_processor.cc
@@ -51,8 +51,8 @@ void ThemeChangeProcessor::Observe(NotificationType type,
// one that was already installed. Otherwise, current_theme
// still points to the previous theme until it gets installed
// and loaded (and we get an EXTENSION_LOADED notification).
- LOG(INFO) << "Got BROWSER_THEME_CHANGED notification for theme "
- << GetThemeId(extension);
+ VLOG(1) << "Got BROWSER_THEME_CHANGED notification for theme "
+ << GetThemeId(extension);
DCHECK_EQ(Source<BrowserThemeProvider>(source).ptr(),
profile_->GetThemeProvider());
if (extension != NULL) {
@@ -74,8 +74,8 @@ void ThemeChangeProcessor::Observe(NotificationType type,
if (!extension->is_theme()) {
return;
}
- LOG(INFO) << "Got EXTENSION_LOADED notification for theme "
- << extension->id();
+ VLOG(1) << "Got EXTENSION_LOADED notification for theme "
+ << extension->id();
DCHECK_EQ(extension->id(), current_or_future_theme_id);
DCHECK_EQ(extension, current_theme);
break;
@@ -90,8 +90,8 @@ void ThemeChangeProcessor::Observe(NotificationType type,
if (!extension->is_theme()) {
return;
}
- LOG(INFO) << "Got EXTENSION_UNLOADED notification for theme "
- << extension->id();
+ VLOG(1) << "Got EXTENSION_UNLOADED notification for theme "
+ << extension->id();
extension = current_theme;
break;
default:
@@ -103,7 +103,7 @@ void ThemeChangeProcessor::Observe(NotificationType type,
if (extension) {
DCHECK(extension->is_theme());
}
- LOG(INFO) << "Theme changed to " << GetThemeId(extension);
+ VLOG(1) << "Theme changed to " << GetThemeId(extension);
// Here, we know that a theme is being set; the theme is a custom
// theme iff extension is non-NULL.
@@ -193,8 +193,8 @@ void ThemeChangeProcessor::StopImpl() {
void ThemeChangeProcessor::StartObserving() {
DCHECK(profile_);
- LOG(INFO) << "Observing BROWSER_THEME_CHANGED, EXTENSION_LOADED, "
- << "and EXTENSION_UNLOADED";
+ VLOG(1) << "Observing BROWSER_THEME_CHANGED, EXTENSION_LOADED, and "
+ "EXTENSION_UNLOADED";
notification_registrar_.Add(
this, NotificationType::BROWSER_THEME_CHANGED,
Source<BrowserThemeProvider>(profile_->GetThemeProvider()));
@@ -208,7 +208,7 @@ void ThemeChangeProcessor::StartObserving() {
void ThemeChangeProcessor::StopObserving() {
DCHECK(profile_);
- LOG(INFO) << "Unobserving all notifications";
+ VLOG(1) << "Unobserving all notifications";
notification_registrar_.RemoveAll();
}
diff --git a/chrome/browser/sync/glue/theme_util.cc b/chrome/browser/sync/glue/theme_util.cc
index 1c619a1..f8b72d1 100644
--- a/chrome/browser/sync/glue/theme_util.cc
+++ b/chrome/browser/sync/glue/theme_util.cc
@@ -84,14 +84,13 @@ void SetCurrentThemeFromThemeSpecifics(
// (i.e., those not on either Google gallery).
std::string id(theme_specifics.custom_theme_id());
GURL update_url(theme_specifics.custom_theme_update_url());
- LOG(INFO) << "Applying theme " << id << " with update_url "
- << update_url;
+ VLOG(1) << "Applying theme " << id << " with update_url " << update_url;
ExtensionsService* extensions_service = profile->GetExtensionsService();
CHECK(extensions_service);
Extension* extension = extensions_service->GetExtensionById(id, true);
if (extension) {
if (!extension->is_theme()) {
- LOG(INFO) << "Extension " << id << " is not a theme; aborting";
+ VLOG(1) << "Extension " << id << " is not a theme; aborting";
return;
}
ExtensionPrefs* extension_prefs = extensions_service->extension_prefs();
@@ -102,7 +101,7 @@ void SetCurrentThemeFromThemeSpecifics(
// function that does so.
if (extension_prefs->GetExtensionState(extension->id()) !=
Extension::ENABLED) {
- LOG(INFO) << "Theme " << id << " is not enabled; aborting";
+ VLOG(1) << "Theme " << id << " is not enabled; aborting";
return;
}
// Get previous theme info before we set the new theme.
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc
index deb11f8..f87bc38 100644
--- a/chrome/browser/sync/glue/typed_url_change_processor.cc
+++ b/chrome/browser/sync/glue/typed_url_change_processor.cc
@@ -48,7 +48,7 @@ void TypedUrlChangeProcessor::Observe(NotificationType type,
if (!observing_)
return;
- LOG(INFO) << "Observed typed_url change.";
+ VLOG(1) << "Observed typed_url change.";
DCHECK(running());
DCHECK(NotificationType::HISTORY_TYPED_URLS_MODIFIED == type ||
NotificationType::HISTORY_URLS_DELETED == type ||
diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
index 6fca194..da095fc 100644
--- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc
+++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
@@ -64,7 +64,7 @@ TypedUrlDataTypeController::~TypedUrlDataTypeController() {
}
void TypedUrlDataTypeController::Start(StartCallback* start_callback) {
- LOG(INFO) << "Starting typed_url data controller.";
+ VLOG(1) << "Starting typed_url data controller.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(start_callback);
if (state_ != NOT_RUNNING || start_callback_.get()) {
@@ -90,7 +90,7 @@ void TypedUrlDataTypeController::Start(StartCallback* start_callback) {
void TypedUrlDataTypeController::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
- LOG(INFO) << "History loaded observed.";
+ VLOG(1) << "History loaded observed.";
notification_registrar_.Remove(this,
NotificationType::HISTORY_LOADED,
NotificationService::AllSources());
@@ -101,7 +101,7 @@ void TypedUrlDataTypeController::Observe(NotificationType type,
}
void TypedUrlDataTypeController::Stop() {
- LOG(INFO) << "Stopping typed_url data type controller.";
+ VLOG(1) << "Stopping typed_url data type controller.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (change_processor_ != NULL)
@@ -116,7 +116,7 @@ void TypedUrlDataTypeController::Stop() {
}
void TypedUrlDataTypeController::StartImpl(history::HistoryBackend* backend) {
- LOG(INFO) << "TypedUrl data type controller StartImpl called.";
+ VLOG(1) << "TypedUrl data type controller StartImpl called.";
// No additional services need to be started before we can proceed
// with model association.
ProfileSyncFactory::SyncComponents sync_components =
@@ -149,7 +149,7 @@ void TypedUrlDataTypeController::StartImpl(history::HistoryBackend* backend) {
void TypedUrlDataTypeController::StartDone(
DataTypeController::StartResult result,
DataTypeController::State new_state) {
- LOG(INFO) << "TypedUrl data type controller StartDone called.";
+ VLOG(1) << "TypedUrl data type controller StartDone called.";
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
NewRunnableMethod(
this,
@@ -161,7 +161,7 @@ void TypedUrlDataTypeController::StartDone(
void TypedUrlDataTypeController::StartDoneImpl(
DataTypeController::StartResult result,
DataTypeController::State new_state) {
- LOG(INFO) << "TypedUrl data type controller StartDoneImpl called.";
+ VLOG(1) << "TypedUrl data type controller StartDoneImpl called.";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
set_state(new_state);
start_callback_->Run(result);
@@ -175,7 +175,7 @@ void TypedUrlDataTypeController::StartDoneImpl(
}
void TypedUrlDataTypeController::StopImpl() {
- LOG(INFO) << "TypedUrl data type controller StopImpl called.";
+ VLOG(1) << "TypedUrl data type controller StopImpl called.";
change_processor_.reset();
model_associator_.reset();
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc
index ad8d11a..dc9cc3a 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -30,7 +30,7 @@ TypedUrlModelAssociator::TypedUrlModelAssociator(
}
bool TypedUrlModelAssociator::AssociateModels() {
- LOG(INFO) << "Associating TypedUrl Models";
+ VLOG(1) << "Associating TypedUrl Models";
DCHECK(expected_loop_ == MessageLoop::current());
std::vector<history::URLRow> typed_urls;