[Sync] Clean up sync logging

chrome/browser/sync/profile_sync_service_harness.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <iterator>
 #include <ostream>
 #include <set>
+#include <sstream>
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/tracked.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/sessions/session_state.h"
@@ skipping 61 matching lines @@
 
 bool StateChangeTimeoutEvent::Abort() {
   aborted_ = true;
   caller_ = NULL;
   return !did_timeout_;
 }
 
 ProfileSyncServiceHarness::ProfileSyncServiceHarness(
     Profile* profile,
     const std::string& username,
-    const std::string& password,
-    int id)
+    const std::string& password)
     : waiting_for_encryption_type_(syncable::UNSPECIFIED),
       wait_state_(INITIAL_WAIT_STATE),
       profile_(profile),
       service_(NULL),
       timestamp_match_partner_(NULL),
       username_(username),
       password_(password),
-      id_(id) {
+      profile_debug_name_(profile->GetDebugName()) {
   if (IsSyncAlreadySetup()) {
     service_ = profile_->GetProfileSyncService();
     service_->AddObserver(this);
     wait_state_ = FULLY_SYNCED;
   }
 }
 
 // static
 ProfileSyncServiceHarness* ProfileSyncServiceHarness::CreateAndAttach(
     Profile* profile) {
   if (!profile->HasProfileSyncService()) {
     NOTREACHED() << "Profile has never signed into sync.";
     return NULL;
   }
-  return new ProfileSyncServiceHarness(profile, "", "", 0);
+  return new ProfileSyncServiceHarness(profile, "", "");
 }
 
 void ProfileSyncServiceHarness::SetCredentials(const std::string& username,
                                                const std::string& password) {
   username_ = username;
   password_ = password;
 }
 
 bool ProfileSyncServiceHarness::IsSyncAlreadySetup() {
   return profile_->HasProfileSyncService();
 }
 
 bool ProfileSyncServiceHarness::SetupSync() {
   syncable::ModelTypeSet synced_datatypes;
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
       i < syncable::MODEL_TYPE_COUNT; ++i) {
     synced_datatypes.insert(syncable::ModelTypeFromInt(i));
   }
   bool result = SetupSync(synced_datatypes);
   if (result == false) {
     std::string status = GetServiceStatus();
-    LOG(ERROR) << "Client " << id_ << ": SetupSync failed. Syncer status:\n"
-               << status;
+    LOG(ERROR) << profile_debug_name_
+               << ": SetupSync failed. Syncer status:\n" << status;
   } else {
-    VLOG(1) << "Client " << id_ << ": SetupSync successful.";
+    VLOG(1) << profile_debug_name_ << ": SetupSync successful.";
   }
   return result;
 }
 
 bool ProfileSyncServiceHarness::SetupSync(
     const syncable::ModelTypeSet& synced_datatypes) {
   // Initialize the sync client's profile sync service object.
   service_ = profile_->GetProfileSyncService("");
   if (service_ == NULL) {
     LOG(ERROR) << "SetupSync(): service_ is null.";
@@ skipping 50 matching lines @@
 }
 
 void ProfileSyncServiceHarness::SignalStateComplete() {
   MessageLoop::current()->Quit();
 }
 
 bool ProfileSyncServiceHarness::RunStateChangeMachine() {
   WaitState original_wait_state = wait_state_;
   switch (wait_state_) {
     case WAITING_FOR_ON_BACKEND_INITIALIZED: {
-      LogClientInfo("WAITING_FOR_ON_BACKEND_INITIALIZED", 1);
+      VLOG(1) << "WAITING_FOR_ON_BACKEND_INITIALIZED: " << GetClientInfo();
       if (service()->sync_initialized()) {
         // The sync backend is initialized.
         SignalStateCompleteWithNextState(WAITING_FOR_INITIAL_SYNC);
       }
       break;
     }
     case WAITING_FOR_INITIAL_SYNC: {
-      LogClientInfo("WAITING_FOR_INITIAL_SYNC", 1);
+      VLOG(1) << "WAITING_FOR_INITIAL_SYNC: " << GetClientInfo();
       if (IsSynced()) {
         // The first sync cycle is now complete. We can start running tests.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
         break;
       }
       if (service()->passphrase_required_reason() ==
               sync_api::REASON_SET_PASSPHRASE_FAILED) {
         // A passphrase is required for decryption and we don't have it. Do not
         // wait any more.
         SignalStateCompleteWithNextState(SET_PASSPHRASE_FAILED);
         break;
       }
       break;
     }
     case WAITING_FOR_SYNC_TO_FINISH: {
-      LogClientInfo("WAITING_FOR_SYNC_TO_FINISH", 1);
+      VLOG(1) << "WAITING_FOR_SYNC_TO_FINISH: " << GetClientInfo();
       if (IsSynced()) {
         // The sync cycle we were waiting for is complete.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
         break;
       }
       if (service()->passphrase_required_reason() ==
               sync_api::REASON_SET_PASSPHRASE_FAILED) {
         // A passphrase is required for decryption and we don't have it. Do not
         // wait any more.
         SignalStateCompleteWithNextState(SET_PASSPHRASE_FAILED);
         break;
       }
       if (!GetStatus().server_reachable) {
         // The client cannot reach the sync server because the network is
         // disabled. There is no need to wait anymore.
         SignalStateCompleteWithNextState(SERVER_UNREACHABLE);
         break;
       }
       break;
     }
     case WAITING_FOR_UPDATES: {
-      LogClientInfo("WAITING_FOR_UPDATES", 1);
+      VLOG(1) << "WAITING_FOR_UPDATES: " << GetClientInfo();
       DCHECK(timestamp_match_partner_);
       if (!MatchesOtherClient(timestamp_match_partner_)) {
         // The client is not yet fully synced; keep waiting until we converge.
         break;
       }
       timestamp_match_partner_->service()->RemoveObserver(this);
       timestamp_match_partner_ = NULL;
 
       SignalStateCompleteWithNextState(FULLY_SYNCED);
       break;
     }
     case WAITING_FOR_PASSPHRASE_REQUIRED: {
-      LogClientInfo("WAITING_FOR_PASSPHRASE_REQUIRED", 1);
+      VLOG(1) << "WAITING_FOR_PASSPHRASE_REQUIRED: " << GetClientInfo();
       if (service()->IsPassphraseRequired()) {
         // A passphrase is now required. Wait for it to be accepted.
         SignalStateCompleteWithNextState(WAITING_FOR_PASSPHRASE_ACCEPTED);
       }
       break;
     }
     case WAITING_FOR_PASSPHRASE_ACCEPTED: {
-      LogClientInfo("WAITING_FOR_PASSPHRASE_ACCEPTED", 1);
+      VLOG(1) << "WAITING_FOR_PASSPHRASE_ACCEPTED: " << GetClientInfo();
       if (service()->ShouldPushChanges() &&
           !service()->IsPassphraseRequired()) {
         // The passphrase has been accepted, and sync has been restarted.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
       }
       break;
     }
     case WAITING_FOR_ENCRYPTION: {
-      LogClientInfo("WAITING_FOR_ENCRYPTION", 1);
+      VLOG(1) << "WAITING_FOR_ENCRYPTION: " << GetClientInfo();
       if (IsSynced() &&
           IsTypeEncrypted(waiting_for_encryption_type_) &&
           GetLastSessionSnapshot()->num_conflicting_updates == 0) {
         // Encryption is now complete for the the type in which we were waiting.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
         break;
       }
       if (!GetStatus().server_reachable) {
         // The client cannot reach the sync server because the network is
         // disabled. There is no need to wait anymore.
         SignalStateCompleteWithNextState(SERVER_UNREACHABLE);
         break;
       }
       break;
     }
     case WAITING_FOR_SYNC_CONFIGURATION: {
-      LogClientInfo("WAITING_FOR_SYNC_CONFIGURATION", 1);
+      VLOG(1) << "WAITING_FOR_SYNC_CONFIGURATION: " << GetClientInfo();
       if (service()->ShouldPushChanges()) {
         // The Datatype manager is configured and sync is fully initialized.
         SignalStateCompleteWithNextState(FULLY_SYNCED);
       }
       break;
     }
     case SERVER_UNREACHABLE: {
-      LogClientInfo("SERVER_UNREACHABLE", 1);
+      VLOG(1) << "SERVER_UNREACHABLE: " << GetClientInfo();
       if (GetStatus().server_reachable) {
         // The client was offline due to the network being disabled, but is now
         // back online. Wait for the pending sync cycle to complete.
         SignalStateCompleteWithNextState(WAITING_FOR_SYNC_TO_FINISH);
       }
       break;
     }
     case SET_PASSPHRASE_FAILED: {
       // A passphrase is required for decryption. There is nothing the sync
       // client can do until SetPassphrase() is called.
-      LogClientInfo("SET_PASSPHRASE_FAILED", 1);
+      VLOG(1) << "SET_PASSPHRASE_FAILED: " << GetClientInfo();
       break;
     }
     case FULLY_SYNCED: {
       // The client is online and fully synced. There is nothing to do.
-      LogClientInfo("FULLY_SYNCED", 1);
+      VLOG(1) << "FULLY_SYNCED: " << GetClientInfo();
       break;
     }
     case SYNC_DISABLED: {
       // Syncing is disabled for the client. There is nothing to do.
-      LogClientInfo("SYNC_DISABLED", 1);
+      VLOG(1) << "SYNC_DISABLED: " << GetClientInfo();
       break;
     }
     default:
       // Invalid state during observer callback which may be triggered by other
       // classes using the the UI message loop.  Defer to their handling.
       break;
   }
   return original_wait_state != wait_state_;
 }
 
 void ProfileSyncServiceHarness::OnStateChanged() {
   RunStateChangeMachine();
 }
 
 bool ProfileSyncServiceHarness::AwaitPassphraseRequired() {
-  LogClientInfo("AwaitPassphraseRequired", 1);
+  VLOG(1) << "AwaitPassphraseRequired: " << GetClientInfo();
   if (wait_state_ == SYNC_DISABLED) {
-    LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
+    LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
 
   if (service()->IsPassphraseRequired()) {
     // It's already true that a passphrase is required; don't wait.
     return true;
   }
 
   wait_state_ = WAITING_FOR_PASSPHRASE_REQUIRED;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                       "Waiting for passphrase to be required.");
 }
 
 bool ProfileSyncServiceHarness::AwaitPassphraseAccepted() {
-  LogClientInfo("AwaitPassphraseAccepted", 1);
+  VLOG(1) << "AwaitPassphraseAccepted: " << GetClientInfo();
   if (wait_state_ == SYNC_DISABLED) {
-    LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
+    LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
 
   if (service()->ShouldPushChanges() &&
       !service()->IsPassphraseRequired()) {
     // Passphrase is already accepted; don't wait.
     return true;
   }
 
   wait_state_ = WAITING_FOR_PASSPHRASE_ACCEPTED;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                       "Waiting for passphrase to be accepted.");
 }
 
 bool ProfileSyncServiceHarness::AwaitBackendInitialized() {
-  LogClientInfo("AwaitBackendInitialized", 1);
+  VLOG(1) << "AwaitBackendInitialized: " << GetClientInfo();
   if (service()->sync_initialized()) {
     // The sync backend host has already been initialized; don't wait.
     return true;
   }
 
   wait_state_ = WAITING_FOR_ON_BACKEND_INITIALIZED;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                       "Waiting for OnBackendInitialized().");
 }
 
 bool ProfileSyncServiceHarness::AwaitSyncRestart() {
-  LogClientInfo("AwaitSyncRestart", 1);
+  VLOG(1) << "AwaitSyncRestart: " << GetClientInfo();
   if (service()->ShouldPushChanges()) {
     // Sync has already been restarted; don't wait.
     return true;
   }
 
   // Wait for the sync backend to be initialized.
   if (!AwaitBackendInitialized()) {
     LOG(ERROR) << "OnBackendInitialized() not seen after "
                << kLiveSyncOperationTimeoutMs / 1000
                << " seconds.";
     return false;
   }
 
   // Wait for sync configuration to complete.
   wait_state_ = WAITING_FOR_SYNC_CONFIGURATION;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs,
                                       "Waiting for sync configuration.");
 }
 
 bool ProfileSyncServiceHarness::AwaitSyncCycleCompletion(
     const std::string& reason) {
-  LogClientInfo("AwaitSyncCycleCompletion", 1);
+  VLOG(1) << "AwaitSyncCycleCompletion: " << GetClientInfo();
   if (wait_state_ == SYNC_DISABLED) {
-    LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
+    LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
 
   if (IsSynced()) {
     // Client is already synced; don't wait.
     return true;
   }
 
   if (wait_state_ == SERVER_UNREACHABLE) {
     // Client was offline; wait for it to go online, and then wait for sync.
     AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason);
     DCHECK_EQ(wait_state_, WAITING_FOR_SYNC_TO_FINISH);
     return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason);
+  }
+
+  DCHECK(service()->sync_initialized());
+  wait_state_ = WAITING_FOR_SYNC_TO_FINISH;
+  AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason);
+  if (wait_state_ == FULLY_SYNCED) {
+    // Client is online; sync was successful.
+    return true;
+  } else if (wait_state_ == SERVER_UNREACHABLE) {
+    // Client is offline; sync was unsuccessful.
+    LOG(ERROR) << "Client went offline after waiting for sync to finish";
+    return false;
   } else {
-    DCHECK(service()->sync_initialized());
-    wait_state_ = WAITING_FOR_SYNC_TO_FINISH;
-    AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason);
-    if (wait_state_ == FULLY_SYNCED) {
-      // Client is online; sync was successful.
-      return true;
-    } else if (wait_state_ == SERVER_UNREACHABLE) {
-      // Client is offline; sync was unsuccessful.
-      return false;
-    } else {
-      LOG(ERROR) << "Invalid wait state:" << wait_state_;
-      return false;
-    }
+    LOG(ERROR) << "Invalid wait state: " << wait_state_;
+    return false;
   }
 }
 
 bool ProfileSyncServiceHarness::AwaitMutualSyncCycleCompletion(
     ProfileSyncServiceHarness* partner) {
-  LogClientInfo("AwaitMutualSyncCycleCompletion", 1);
+  VLOG(1) << "AwaitMutualSyncCycleCompletion: " << GetClientInfo();
   if (!AwaitSyncCycleCompletion("Sync cycle completion on active client."))
     return false;
   return partner->WaitUntilTimestampMatches(this,
       "Sync cycle completion on passive client.");
 }
 
 bool ProfileSyncServiceHarness::AwaitGroupSyncCycleCompletion(
     std::vector<ProfileSyncServiceHarness*>& partners) {
-  LogClientInfo("AwaitGroupSyncCycleCompletion", 1);
+  VLOG(1) << "AwaitGroupSyncCycleCompletion: " << GetClientInfo();
   if (!AwaitSyncCycleCompletion("Sync cycle completion on active client."))
     return false;
   bool return_value = true;
   for (std::vector<ProfileSyncServiceHarness*>::iterator it =
       partners.begin(); it != partners.end(); ++it) {
     if ((this != *it) && ((*it)->wait_state_ != SYNC_DISABLED)) {
       return_value = return_value &&
           (*it)->WaitUntilTimestampMatches(this,
           "Sync cycle completion on partner client.");
     }
@@ skipping 10 matching lines @@
       clients.begin(); it != clients.end(); ++it) {
     if ((*it)->wait_state_ != SYNC_DISABLED)
       return_value = return_value &&
           (*it)->AwaitGroupSyncCycleCompletion(clients);
   }
   return return_value;
 }
 
 bool ProfileSyncServiceHarness::WaitUntilTimestampMatches(
     ProfileSyncServiceHarness* partner, const std::string& reason) {
-  LogClientInfo("WaitUntilTimestampMatches", 1);
+  VLOG(1) << "WaitUntilTimestampMatches: " << GetClientInfo();
   if (wait_state_ == SYNC_DISABLED) {
-    LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
+    LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
 
   if (MatchesOtherClient(partner)) {
     // Timestamps already match; don't wait.
     return true;
   }
 
   DCHECK(!timestamp_match_partner_);
   timestamp_match_partner_ = partner;
   partner->service()->AddObserver(this);
   wait_state_ = WAITING_FOR_UPDATES;
   return AwaitStatusChangeWithTimeout(kLiveSyncOperationTimeoutMs, reason);
 }
 
 bool ProfileSyncServiceHarness::AwaitStatusChangeWithTimeout(
     int timeout_milliseconds,
     const std::string& reason) {
-  LogClientInfo("AwaitStatusChangeWithTimeout", 1);
+  VLOG(1) << "AwaitStatusChangeWithTimeout: " << GetClientInfo();
   if (wait_state_ == SYNC_DISABLED) {
-    LOG(ERROR) << "Sync disabled for Client " << id_ << ".";
+    LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
   scoped_refptr<StateChangeTimeoutEvent> timeout_signal(
       new StateChangeTimeoutEvent(this, reason));
   MessageLoop* loop = MessageLoop::current();
   bool did_allow_nestable_tasks = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
   loop->PostDelayedTask(
       FROM_HERE,
       NewRunnableMethod(timeout_signal.get(),
                         &StateChangeTimeoutEvent::Callback),
       timeout_milliseconds);
   loop->Run();
   loop->SetNestableTasksAllowed(did_allow_nestable_tasks);
   if (timeout_signal->Abort()) {
-    LogClientInfo("AwaitStatusChangeWithTimeout succeeded", 1);
+    VLOG(1) << "AwaitStatusChangeWithTimeout succeeded: " << GetClientInfo();
     return true;
   } else {
-    LogClientInfo("AwaitStatusChangeWithTimeout timed out", 0);
+    VLOG(0) << "AwaitStatusChangeWithTimeout timed out: " << GetClientInfo();
     return false;
   }
 }
 
 ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() {
   DCHECK(service() != NULL) << "GetStatus(): service() is NULL.";
   return service()->QueryDetailedSyncStatus();
 }
 
 bool ProfileSyncServiceHarness::IsSynced() {
-  LogClientInfo("IsSynced", 1);
-  if (service() == NULL)
+  VLOG(1) << "IsSynced: " << GetClientInfo();
+  if (service() == NULL) {
+    VLOG(1) << "NULL service; assuming not synced";
     return false;
+  }
   const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
   // TODO(rsimha): Remove additional checks of snap->has_more_to_sync and
   // snap->unsynced_count once http://crbug.com/48989 is fixed.
-  return (snap &&
-          snap->num_blocking_conflicting_updates == 0 &&
-          ServiceIsPushingChanges() &&
-          GetStatus().notifications_enabled &&
-          !service()->HasUnsyncedItems() &&
-          !snap->has_more_to_sync &&
-          snap->unsynced_count == 0 &&
-          !service()->HasPendingBackendMigration() &&
-          service()->passphrase_required_reason() !=
-              sync_api::REASON_SET_PASSPHRASE_FAILED);
+  bool is_synced = snap &&
+      snap->num_blocking_conflicting_updates == 0 &&
+      ServiceIsPushingChanges() &&
+      GetStatus().notifications_enabled &&
+      !service()->HasUnsyncedItems() &&
+      !snap->has_more_to_sync &&
+      snap->unsynced_count == 0 &&
+      !service()->HasPendingBackendMigration() &&
+      service()->passphrase_required_reason() !=
+      sync_api::REASON_SET_PASSPHRASE_FAILED;
+  VLOG(1) << "IsSynced: " << is_synced;
+  return is_synced;
 }
 
 bool ProfileSyncServiceHarness::MatchesOtherClient(
     ProfileSyncServiceHarness* partner) {
   if (!IsSynced())
     return false;
 
   // Only look for a match if we have at least one enabled datatype in
   // common with the partner client.
   syncable::ModelTypeSet types, other_types, intersection_types;
@@ skipping 18 matching lines @@
     ProfileSyncServiceHarness::GetLastSessionSnapshot() const {
   DCHECK(service_ != NULL) << "Sync service has not yet been set up.";
   if (service_->sync_initialized()) {
     return service_->GetLastSessionSnapshot();
   }
   return NULL;
 }
 
 bool ProfileSyncServiceHarness::EnableSyncForDatatype(
     syncable::ModelType datatype) {
-  LogClientInfo("EnableSyncForDatatype", 1);
+  VLOG(1) << "EnableSyncForDatatype: " << GetClientInfo();
 
   syncable::ModelTypeSet synced_datatypes;
   if (wait_state_ == SYNC_DISABLED) {
     synced_datatypes.insert(datatype);
     return SetupSync(synced_datatypes);
   }
 
   if (service() == NULL) {
     LOG(ERROR) << "EnableSyncForDatatype(): service() is null.";
     return false;
   }
 
   service()->GetPreferredDataTypes(&synced_datatypes);
   syncable::ModelTypeSet::iterator it = synced_datatypes.find(datatype);
   if (it != synced_datatypes.end()) {
     VLOG(1) << "EnableSyncForDatatype(): Sync already enabled for datatype "
             << syncable::ModelTypeToString(datatype)
-            << " on Client " << id_ << ".";
+            << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   synced_datatypes.insert(syncable::ModelTypeFromInt(datatype));
   service()->OnUserChoseDatatypes(false, synced_datatypes);
   if (AwaitSyncCycleCompletion("Datatype configuration.")) {
     VLOG(1) << "EnableSyncForDatatype(): Enabled sync for datatype "
             << syncable::ModelTypeToString(datatype)
-            << " on Client " << id_ << ".";
+            << " on " << profile_debug_name_ << ".";
     return true;
   }
 
-  LogClientInfo("EnableSyncForDatatype failed", 0);
+  VLOG(0) << "EnableSyncForDatatype failed: " << GetClientInfo();
   return false;
 }
 
 bool ProfileSyncServiceHarness::DisableSyncForDatatype(
     syncable::ModelType datatype) {
-  LogClientInfo("DisableSyncForDatatype", 1);
+  VLOG(1) << "DisableSyncForDatatype: " << GetClientInfo();
 
   syncable::ModelTypeSet synced_datatypes;
   if (service() == NULL) {
     LOG(ERROR) << "DisableSyncForDatatype(): service() is null.";
     return false;
   }
 
   service()->GetPreferredDataTypes(&synced_datatypes);
   syncable::ModelTypeSet::iterator it = synced_datatypes.find(datatype);
   if (it == synced_datatypes.end()) {
     VLOG(1) << "DisableSyncForDatatype(): Sync already disabled for datatype "
             << syncable::ModelTypeToString(datatype)
-            << " on Client " << id_ << ".";
+            << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   synced_datatypes.erase(it);
   service()->OnUserChoseDatatypes(false, synced_datatypes);
   if (AwaitSyncCycleCompletion("Datatype reconfiguration.")) {
     VLOG(1) << "DisableSyncForDatatype(): Disabled sync for datatype "
             << syncable::ModelTypeToString(datatype)
-            << " on Client " << id_ << ".";
+            << " on " << profile_debug_name_ << ".";
     return true;
   }
 
-  LogClientInfo("DisableSyncForDatatype failed", 0);
+  VLOG(0) << "DisableSyncForDatatype failed: " << GetClientInfo();
   return false;
 }
 
 bool ProfileSyncServiceHarness::EnableSyncForAllDatatypes() {
-  LogClientInfo("EnableSyncForAllDatatypes", 1);
+  VLOG(1) << "EnableSyncForAllDatatypes: " << GetClientInfo();
 
   if (wait_state_ == SYNC_DISABLED) {
     return SetupSync();
   }
 
   if (service() == NULL) {
     LOG(ERROR) << "EnableSyncForAllDatatypes(): service() is null.";
     return false;
   }
 
   syncable::ModelTypeSet synced_datatypes;
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
        i < syncable::MODEL_TYPE_COUNT;
        ++i) {
     synced_datatypes.insert(syncable::ModelTypeFromInt(i));
   }
   service()->OnUserChoseDatatypes(true, synced_datatypes);
   if (AwaitSyncCycleCompletion("Datatype reconfiguration.")) {
     VLOG(1) << "EnableSyncForAllDatatypes(): Enabled sync for all datatypes on "
-               "Client " << id_ << ".";
+            << profile_debug_name_ << ".";
     return true;
   }
 
-  LogClientInfo("EnableSyncForAllDatatypes failed", 0);
+  VLOG(0) << "EnableSyncForAllDatatypes failed: " << GetClientInfo();
   return false;
 }
 
 bool ProfileSyncServiceHarness::DisableSyncForAllDatatypes() {
-  LogClientInfo("DisableSyncForAllDatatypes", 1);
+  VLOG(1) << "DisableSyncForAllDatatypes: " << GetClientInfo();
 
   if (service() == NULL) {
     LOG(ERROR) << "DisableSyncForAllDatatypes(): service() is null.";
     return false;
   }
 
   service()->DisableForUser();
   wait_state_ = SYNC_DISABLED;
   VLOG(1) << "DisableSyncForAllDatatypes(): Disabled sync for all datatypes on "
-             "Client " << id_;
+          << profile_debug_name_;
   return true;
 }
 
 std::string ProfileSyncServiceHarness::GetUpdatedTimestamp(
     syncable::ModelType model_type) {
   const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
   DCHECK(snap != NULL) << "GetUpdatedTimestamp(): Sync snapshot is NULL.";
   return snap->download_progress_markers[model_type];
 }
 
-void ProfileSyncServiceHarness::LogClientInfo(const std::string& message,
-                                              int log_level) {
+std::string ProfileSyncServiceHarness::GetClientInfo() {
+  std::stringstream os;
+  os << profile_debug_name_ << ": ";
   if (service()) {
     const SyncSessionSnapshot* snap = GetLastSessionSnapshot();
+    const ProfileSyncService::Status& status = GetStatus();
     if (snap) {
-      VLOG(log_level) << "Client " << id_ << ": " << message
-                      << ": num_updates_downloaded : "
-                      << snap->syncer_status.num_updates_downloaded_total
-                      << ", has_more_to_sync: " << snap->has_more_to_sync
-                      << ", unsynced_count: " << snap->unsynced_count
-                      << ", num_blocking_conflicting_updates: "
-                      << snap->num_blocking_conflicting_updates
-                      << ", num_conflicting_updates: "
-                      << snap->num_conflicting_updates
-                      << ", has_unsynced_items: "
-                      << service()->HasUnsyncedItems()
-                      << ", passphrase_required_reason: "
-                      << sync_api::PassphraseRequiredReasonToString(
-                            service()->passphrase_required_reason())
-                      << ", notifications_enabled: "
-                      << GetStatus().notifications_enabled
-                      << ", service_is_pushing_changes: "
-                      << ServiceIsPushingChanges()
-                      << ", has_pending_backend_migration: "
-                      << service()->HasPendingBackendMigration();
+      os << "snapshot: " << snap->ToString()
+         << ", has_unsynced_items: "
+         << service()->HasUnsyncedItems()
+         << ", passphrase_required_reason: "
+         << sync_api::PassphraseRequiredReasonToString(
+             service()->passphrase_required_reason())
+         << ", notifications_enabled: "
+         << status.notifications_enabled
+         << ", local_overwrites_total: "
+         << status.num_local_overwrites_total
+         << ", server_overwrites_total: "
+         << status.num_server_overwrites_total
+         << ", service_is_pushing_changes: "
+         << ServiceIsPushingChanges()
+         << ", has_pending_backend_migration: "
+         << service()->HasPendingBackendMigration();
     } else {
-      VLOG(log_level) << "Client " << id_ << ": " << message
-                      << ": Sync session snapshot not available.";
+      os << "Sync session snapshot not available";
     }
   } else {
-    VLOG(log_level) << "Client " << id_ << ": " << message
-                    << ": Sync service not available.";
+    os << "Sync service not available";
   }
+  return os.str();
 }
 
 bool ProfileSyncServiceHarness::EnableEncryptionForType(
     syncable::ModelType type) {
   syncable::ModelTypeSet encrypted_types;
   service_->GetEncryptedDataTypes(&encrypted_types);
   if (encrypted_types.count(type) > 0)
     return true;
   encrypted_types.insert(type);
   service_->EncryptDataTypes(encrypted_types);
@@ skipping 32 matching lines @@
   return true;
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }