[Sync] Clean up sync logging

chrome/test/live_sync/live_sync_extension_helper.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/test/live_sync/live_sync_extension_helper.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-std::string GetProfileName(Profile* profile) {
-  const std::string& name = profile->GetPath().BaseName().MaybeAsASCII();
-  EXPECT_FALSE(name.empty());
-  return name;
-}
-
-}  // namespace
-
 LiveSyncExtensionHelper::LiveSyncExtensionHelper() {}
 
 LiveSyncExtensionHelper::~LiveSyncExtensionHelper() {}
 
 // static
 std::string LiveSyncExtensionHelper::NameToId(const std::string& name) {
   std::string id;
   EXPECT_TRUE(Extension::GenerateId(name, &id));
   return id;
 }
@@ skipping 45 matching lines @@
       pending_extension_manager->end());
   for (PendingExtensionManager::const_iterator it = pending_extensions.begin();
        it != pending_extensions.end(); ++it) {
     if (!it->second.is_from_sync()) {
       continue;
     }
     const std::string& id = it->first;
     StringMap::const_iterator it2 = id_to_name_.find(id);
     if (it2 == id_to_name_.end()) {
       ADD_FAILURE() << "Could not get name for id " << id
-                    << " (profile = " << GetProfileName(profile) << ")";
+                    << " (profile = " << profile->GetDebugName() << ")";
       continue;
     }
     InstallExtension(profile, it2->second, type);
   }
 }
 
 LiveSyncExtensionHelper::ExtensionStateMap
     LiveSyncExtensionHelper::GetExtensionStates(
         Profile* profile) const {
-  const std::string& profile_name = GetProfileName(profile);
+  const std::string& profile_debug_name = profile->GetDebugName();
 
   ExtensionStateMap extension_state_map;
 
   ExtensionService* extension_service = profile->GetExtensionService();
 
   const ExtensionList* extensions = extension_service->extensions();
   for (ExtensionList::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     extension_state_map[(*it)->id()] = ENABLED;
     VLOG(2) << "Extension " << (*it)->id() << " in profile "
-            << profile_name << " is enabled";
+            << profile_debug_name << " is enabled";
   }
 
   const ExtensionList* disabled_extensions =
       extension_service->disabled_extensions();
   for (ExtensionList::const_iterator it = disabled_extensions->begin();
        it != disabled_extensions->end(); ++it) {
     extension_state_map[(*it)->id()] = DISABLED;
     VLOG(2) << "Extension " << (*it)->id() << " in profile "
-            << profile_name << " is disabled";
+            << profile_debug_name << " is disabled";
   }
 
   const PendingExtensionManager* pending_extension_manager =
       extension_service->pending_extension_manager();
   PendingExtensionManager::const_iterator it;
   for (it = pending_extension_manager->begin();
        it != pending_extension_manager->end(); ++it) {
     extension_state_map[it->first] = PENDING;
     VLOG(2) << "Extension " << it->first << " in profile "
-            << profile_name << " is pending";
+            << profile_debug_name << " is pending";
   }
 
   return extension_state_map;
 }
 
 void LiveSyncExtensionHelper::SetupProfile(Profile* profile) {
   profile->InitExtensions(true);
   profile_extensions_.insert(make_pair(profile, ExtensionNameMap()));
 }
 
@@ skipping 97 matching lines @@
   if (extension->id() != expected_id) {
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   VLOG(2) << "created extension with name = "
           << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   return extension;
 }