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

chrome/test/testing_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.
 
 #ifndef CHROME_TEST_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 114 matching lines @@
   // returns it. The profile keeps its own copy of a scoped_refptr to the
   // ExtensionService to make sure that is still alive to be notified when the
   // profile is destroyed.
   ExtensionService* CreateExtensionService(const CommandLine* command_line,
                                            const FilePath& install_directory,
                                            bool autoupdate_enabled);
 
   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();
   virtual VisitedLinkMaster* GetVisitedLinkMaster();
   virtual ExtensionService* GetExtensionService();
   virtual UserScriptMaster* GetUserScriptMaster();
   virtual ExtensionDevToolsManager* GetExtensionDevToolsManager();
   virtual ExtensionProcessManager* GetExtensionProcessManager();
   virtual ExtensionMessageService* GetExtensionMessageService();
   virtual ExtensionEventRouter* GetExtensionEventRouter();
@@ skipping 224 matching lines @@
   scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
 
   scoped_ptr<prerender::PrerenderManager> prerender_manager_;
 
   // We keep a weak pointer to the dependency manager we want to notify on our
   // death. Defaults to the Singleton implementation but overridable for
   // testing.
   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_