Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ...

chrome/browser/profiles/profile.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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_H_
 #pragma once
 
@@ skipping 84 matching lines @@
 class VisitedLinkEventListener;
 class VisitedLinkMaster;
 class WebDataService;
 class WebKitContext;
 class PromoResourceService;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
-typedef intptr_t ProfileId;
-
 class Profile {
  public:
   // Profile services are accessed with the following parameter. This parameter
   // defines what the caller plans to do with the service.
   // The caller is responsible for not performing any operation that would
   // result in persistent implicit records while using an OffTheRecord profile.
   // This flag allows the profile to perform an additional check.
   //
   // It also gives us an opportunity to perform further checks in the future. We
   // could, for example, return an history service that only allow some specific
@@ skipping 16 matching lines @@
 
   class Delegate {
    public:
     // Called when creation of the profile is finished.
     virtual void OnProfileCreated(Profile* profile, bool success) = 0;
   };
 
   // Key used to bind profile to the widget with which it is associated.
   static const char* kProfileKey;
 
-  // Value that represents no profile Id.
-  static const ProfileId kInvalidProfileId;
-
   Profile();
   virtual ~Profile() {}
 
   // Profile prefs are registered as soon as the prefs are loaded for the first
   // time.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Create a new profile given a path.
   static Profile* CreateProfile(const FilePath& path);
 
   // Same as above, but uses async initialization.
   static Profile* CreateProfileAsync(const FilePath& path,
                                      Delegate* delegate);
 
   // Returns the request context for the "default" profile.  This may be called
   // from any thread.  This CAN return NULL if a first request context has not
   // yet been created.  If necessary, listen on the UI thread for
   // NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE.
   static net::URLRequestContextGetter* GetDefaultRequestContext();
 
   // Returns the name associated with this profile. This name is displayed in
   // the browser frame.
   virtual std::string GetProfileName() = 0;
 
-  // Returns a unique Id that can be used to identify this profile at runtime.
-  // This Id is not persistent and will not survive a restart of the browser.
-  virtual ProfileId GetRuntimeId() = 0;
-
   // Returns the path of the directory where this profile's data is stored.
   virtual FilePath GetPath() = 0;
 
   // Return whether this profile is incognito. Default is false.
   virtual bool IsOffTheRecord() = 0;
 
   // Return the incognito version of this profile. The returned pointer
   // is owned by the receiving profile. If the receiving profile is off the
   // record, the same profile is returned.
   virtual Profile* GetOffTheRecordProfile() = 0;
@@ skipping 382 matching lines @@
  private:
   bool restored_last_session_;
 
   // Accessibility events will only be propagated when the pause
   // level is zero.  PauseAccessibilityEvents and ResumeAccessibilityEvents
   // increment and decrement the level, respectively, rather than set it to
   // true or false, so that calls can be nested.
   int accessibility_pause_level_;
 };
 
+#if defined(COMPILER_GCC)
+ namespace __gnu_cxx {
+
+ template<>
+ struct hash<Profile*> {
+   std::size_t operator()(Profile* const& p) const {
+     return reinterpret_cast<std::size_t>(p);
+   }
+ };
+
+ }  // namespace __gnu_cxx
+ #endif
+
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_