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

chrome/test/testing_profile.h

Index: chrome/test/testing_profile.h
===================================================================
--- chrome/test/testing_profile.h	(revision 92020)
+++ chrome/test/testing_profile.h	(working copy)
@@ -132,25 +132,15 @@
   TestingPrefService* GetTestingPrefService();
 
   virtual TestingProfile* AsTestingProfile();
-
   virtual std::string GetProfileName();
-  virtual ProfileId GetRuntimeId();
-
   virtual FilePath GetPath();
-
-  // Sets whether we're incognito. Default is false.
-  void set_incognito(bool incognito) {
-    incognito_ = incognito;
-  }
+  void set_incognito(bool incognito) { incognito_ = incognito; }
   virtual bool IsOffTheRecord();
   // Assumes ownership.
   virtual void SetOffTheRecordProfile(Profile* profile);
   virtual Profile* GetOffTheRecordProfile();
-
   virtual void DestroyOffTheRecordProfile() {}
-
   virtual bool HasOffTheRecordProfile();
-
   virtual Profile* GetOriginalProfile();
   virtual ChromeAppCacheService* GetAppCacheService();
   virtual webkit_database::DatabaseTracker* GetDatabaseTracker();
@@ -395,18 +385,4 @@
   ProfileDependencyManager* profile_dependency_manager_;
 };
 
-// A profile that derives from another profile.  This does not actually
-// override anything except the GetRuntimeId() in order to test sharing of
-// site information.
-class DerivedTestingProfile : public TestingProfile {
- public:
-  explicit DerivedTestingProfile(Profile* profile);
-  virtual ~DerivedTestingProfile();
-
-  virtual ProfileId GetRuntimeId();
-
- protected:
-  Profile* original_profile_;
-};
-
 #endif  // CHROME_TEST_TESTING_PROFILE_H_