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

chrome/browser/profiles/profile.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/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 64 matching lines @@
 
 using base::Time;
 using base::TimeDelta;
 
 // A pointer to the request context for the default profile.  See comments on
 // Profile::GetDefaultRequestContext.
 net::URLRequestContextGetter* Profile::default_request_context_;
 
 namespace {
 
-void NotifyOTRProfileCreatedOnIOThread(ProfileId original_profile_id,
-                                       ProfileId otr_profile_id) {
+void NotifyOTRProfileCreatedOnIOThread(void* original_profile,
+                                       void* otr_profile) {
   ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileCreated(
-      original_profile_id, otr_profile_id);
+      original_profile, otr_profile);
 }
 
-void NotifyOTRProfileDestroyedOnIOThread(ProfileId original_profile_id,
-                                         ProfileId otr_profile_id) {
+void NotifyOTRProfileDestroyedOnIOThread(void* original_profile,
+                                         void* otr_profile) {
   ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileDestroyed(
-      original_profile_id, otr_profile_id);
+      original_profile, otr_profile);
 }
 
 }  // namespace
 
 Profile::Profile()
     : restored_last_session_(false),
       accessibility_pause_level_(0) {
 }
 
 // static
 const char* Profile::kProfileKey = "__PROFILE__";
 
 // static
-const ProfileId Profile::kInvalidProfileId = static_cast<ProfileId>(0);
-
-// static
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
@@ skipping 119 matching lines @@
 #if defined(OS_CHROMEOS)
     GetRequestContext();
 #endif  // defined(OS_CHROMEOS)
 
     // Make the chrome//extension-icon/ resource available.
     ExtensionIconSource* icon_source = new ExtensionIconSource(real_profile);
     GetChromeURLDataManager()->AddDataSource(icon_source);
 
     BrowserThread::PostTask(
     BrowserThread::IO, FROM_HERE,
-    NewRunnableFunction(
-        &NotifyOTRProfileCreatedOnIOThread,
-        profile_->GetRuntimeId(), GetRuntimeId()));
+    NewRunnableFunction(&NotifyOTRProfileCreatedOnIOThread, profile_, this));
   }
 
   virtual ~OffTheRecordProfileImpl() {
     NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_DESTROYED, Source<Profile>(this),
         NotificationService::NoDetails());
 
     ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableFunction(
-            &NotifyOTRProfileDestroyedOnIOThread,
-            profile_->GetRuntimeId(), GetRuntimeId()));
+            &NotifyOTRProfileDestroyedOnIOThread, profile_, this));
 
     // Clean up all DB files/directories
     if (db_tracker_) {
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(
               db_tracker_.get(),
               &webkit_database::DatabaseTracker::Shutdown));
     }
 
     BrowserList::RemoveObserver(this);
 
     if (host_content_settings_map_)
       host_content_settings_map_->ShutdownOnUIThread();
 
     if (pref_proxy_config_tracker_)
       pref_proxy_config_tracker_->DetachFromPrefService();
 
     ExtensionService* extension_service = GetExtensionService();
     if (extension_service) {
       ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
       extension_prefs->ClearIncognitoSessionOnlyContentSettings();
     }
   }
 
-  virtual ProfileId GetRuntimeId() {
-    return reinterpret_cast<ProfileId>(this);
-  }
-
   virtual std::string GetProfileName() {
     // Incognito profile should not return the profile name.
     return std::string();
   }
 
   virtual FilePath GetPath() { return profile_->GetPath(); }
 
   virtual bool IsOffTheRecord() {
     return true;
   }
@@ skipping 548 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }