Revert "Refactor ProfileInfoCache in most of c/b/profiles"

chrome/browser/profiles/profile_shortcut_manager_win.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class BrowserDistribution;
 
 // Internal free-standing functions that are exported here for testing.
 namespace profiles {
 namespace internal {
 
@@ skipping 31 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ShortcutFilenameMatcher);
 };
 
 // Returns the command-line flags to launch Chrome with the given profile.
 base::string16 CreateProfileShortcutFlags(const base::FilePath& profile_path);
 
 }  // namespace internal
 }  // namespace profiles
 
 class ProfileShortcutManagerWin : public ProfileShortcutManager,
-                                  public ProfileAttributesStorage::Observer,
+                                  public ProfileInfoCacheObserver,
                                   public content::NotificationObserver {
  public:
   // Specifies whether only the existing shortcut should be updated, a new
   // shortcut should be created if none exist, or only the icon for this profile
   // should be created in the profile directory.
   enum CreateOrUpdateMode {
     UPDATE_EXISTING_ONLY,
     CREATE_WHEN_NONE_FOUND,
     CREATE_OR_UPDATE_ICON_ONLY,
   };
@@ skipping 10 matching lines @@
   void CreateOrUpdateProfileIcon(const base::FilePath& profile_path) override;
   void CreateProfileShortcut(const base::FilePath& profile_path) override;
   void RemoveProfileShortcuts(const base::FilePath& profile_path) override;
   void HasProfileShortcuts(const base::FilePath& profile_path,
                            const base::Callback<void(bool)>& callback) override;
   void GetShortcutProperties(const base::FilePath& profile_path,
                              base::CommandLine* command_line,
                              base::string16* name,
                              base::FilePath* icon_path) override;
 
-  // ProfileAttributesStorage::Observer implementation:
+  // ProfileInfoCacheObserver implementation:
   void OnProfileAdded(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override;
   void OnProfileNameChanged(const base::FilePath& profile_path,
                             const base::string16& old_profile_name) override;
   void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
 
   // content::NotificationObserver implementation:
   void Observe(int type,
                const content::NotificationSource& source,
@@ skipping 13 matching lines @@
       NonProfileShortcutAction action);
 
   ProfileManager* profile_manager_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManagerWin);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_