Merge 115621 - Refactor ProfileInfoCacheObserver interface and usage thereof.

chrome/browser/profiles/profile_info_cache_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_
 #pragma once
 
 #include "ui/gfx/image/image.h"
 
 class FilePath;
 
 // This class provides an Observer interface to watch for changes to the
 // ProfileInfoCache.
 class ProfileInfoCacheObserver {
  public:
   virtual ~ProfileInfoCacheObserver() {}
 
-  virtual void OnProfileAdded(
-      const string16& profile_name,
-      const string16& profile_base_dir,
-      const FilePath& profile_path,
-      const gfx::Image* avatar_image) = 0;
-  virtual void OnProfileWillBeRemoved(
-      const string16& profile_name) = 0;
-  virtual void OnProfileWasRemoved(
-      const string16& profile_name) = 0;
-  virtual void OnProfileNameChanged(
-      const string16& old_profile_name,
-      const string16& new_profile_name) = 0;
-  virtual void OnProfileAvatarChanged(
-      const string16& profile_name,
-      const string16& profile_base_dir,
-      const FilePath& profile_path,
-      const gfx::Image* avatar_image) = 0;
+  virtual void OnProfileAdded(const FilePath& profile_path) = 0;
+  virtual void OnProfileWillBeRemoved(const FilePath& profile_path) = 0;
+  virtual void OnProfileWasRemoved(const FilePath& profile_path,
+                                   const string16& profile_name) = 0;
+  virtual void OnProfileNameChanged(const FilePath& profile_path,
+                                    const string16& old_profile_name) = 0;
+  virtual void OnProfileAvatarChanged(const FilePath& profile_path) = 0;
 
  protected:
   ProfileInfoCacheObserver() {}
 
   DISALLOW_COPY_AND_ASSIGN(ProfileInfoCacheObserver);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_OBSERVER_H_