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

content/browser/site_instance_unittest.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 "base/compiler_specific.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/browsing_instance.h"
@@ skipping 500 matching lines @@
   // Make sure none of differing privilege processes are mixed.
   EXPECT_NE(extension1_instance->GetProcess(), webui1_instance->GetProcess());
 
   for (size_t i = 0; i < content::kMaxRendererProcessCount; ++i) {
     EXPECT_NE(extension1_instance->GetProcess(), hosts[i]);
     EXPECT_NE(webui1_instance->GetProcess(), hosts[i]);
   }
 
   STLDeleteContainerPointers(hosts.begin(), hosts.end());
 }
-
-// Test to ensure that profiles that derive from each other share site
-// information.
-TEST_F(SiteInstanceTest, GetSiteInstanceMap) {
-  int deleteCounter = 0;
-
-  scoped_ptr<Profile> p1(new TestingProfile());
-  scoped_ptr<Profile> p2(new TestingProfile());
-  scoped_ptr<Profile> p3(new DerivedTestingProfile(p1.get()));
-
-  // In this test, instances 1 and 2 will be deleted automatically when the
-  // SiteInstance objects they return are deleted.  However, instance 3 never
-  // returns any SitesIntance objects in this test, so will not be automatically
-  // deleted.  It must be deleted manually.
-  TestBrowsingInstance* instance1(new TestBrowsingInstance(p1.get(),
-      &deleteCounter));
-  TestBrowsingInstance* instance2(new TestBrowsingInstance(p2.get(),
-      &deleteCounter));
-  scoped_refptr<TestBrowsingInstance> instance3(
-      new TestBrowsingInstance(p3.get(), &deleteCounter));
-
-  instance1->use_process_per_site = true;
-  instance2->use_process_per_site = true;
-  instance3->use_process_per_site = true;
-
-  // The same profile with the same site.
-  scoped_refptr<SiteInstance> s1a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s1b(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  EXPECT_EQ(s1a, s1b);
-
-  // The same profile with different sites.
-  scoped_refptr<SiteInstance> s2a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s2b(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://foo/boo")));
-  EXPECT_NE(s2a, s2b);
-
-  // The different profiles with the same site.
-  scoped_refptr<SiteInstance> s3a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s3b(instance2->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  EXPECT_NE(s3a, s3b);
-
-  // The different profiles with different sites.
-  scoped_refptr<SiteInstance> s4a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s4b(instance2->GetSiteInstanceForURL(
-      GURL("chrome-extension://foo/boo")));
-  EXPECT_NE(s4a, s4b);
-
-  // The derived profiles with the same site.
-  scoped_refptr<SiteInstance> s5a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s5b(instance3->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  EXPECT_EQ(s5a, s5b);
-
-  // The derived profiles with the different sites.
-  scoped_refptr<SiteInstance> s6a(instance1->GetSiteInstanceForURL(
-      GURL("chrome-extension://baz/bar")));
-  scoped_refptr<SiteInstance> s6b(instance3->GetSiteInstanceForURL(
-      GURL("chrome-extension://foo/boo")));
-  EXPECT_NE(s6a, s6b);
-}