SiteInstance unittest improvements

content/browser/browsing_instance.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_BROWSING_INSTANCE_H_
 #define CONTENT_BROWSER_BROWSING_INSTANCE_H_
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
@@ skipping 36 matching lines @@
 // need to be manually deleted.
 //
 // BrowsingInstance has no public members, as it is designed to be
 // visible only from the SiteInstance class.  To get a new
 // SiteInstance that is part of the same BrowsingInstance, use
 // SiteInstance::GetRelatedSiteInstance.  Because of this,
 // BrowsingInstances and SiteInstances are tested together in
 // site_instance_unittest.cc.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class CONTENT_EXPORT BrowsingInstance
+class CONTENT_EXPORT BrowsingInstance final
     : public base::RefCounted<BrowsingInstance> {
  protected:
+  ~BrowsingInstance();
+
   // Create a new BrowsingInstance.
   explicit BrowsingInstance(BrowserContext* context);
 
   // Get the browser context to which this BrowsingInstance belongs.
   BrowserContext* browser_context() const { return browser_context_; }
 
   // Returns whether this BrowsingInstance has registered a SiteInstance for
   // the site of the given URL.
   bool HasSiteInstance(const GURL& url);
 
@@ skipping 19 matching lines @@
   void UnregisterSiteInstance(SiteInstanceImpl* site_instance);
 
   // Tracks the number of WebContents currently in this BrowsingInstance.
   size_t active_contents_count() const { return active_contents_count_; }
   void increment_active_contents_count() { active_contents_count_++; }
   void decrement_active_contents_count() {
     DCHECK_LT(0u, active_contents_count_);
     active_contents_count_--;
   }
 
+ private:
+  friend class base::RefCounted<BrowsingInstance>;
   friend class SiteInstanceImpl;
-
-  friend class base::RefCounted<BrowsingInstance>;
-
-  // Virtual to allow tests to extend it.
-  virtual ~BrowsingInstance();
-
- private:
+  FRIEND_TEST_ALL_PREFIXES(SiteInstanceTest, OneSiteInstancePerSite);
+  FRIEND_TEST_ALL_PREFIXES(SiteInstanceTest,
+                           OneSiteInstancePerSiteInBrowserContext);
   // Map of site to SiteInstance, to ensure we only have one SiteInstance per
   // site.
   typedef base::hash_map<std::string, SiteInstanceImpl*> SiteInstanceMap;
 
   // Common browser context to which all SiteInstances in this BrowsingInstance
   // must belong.
   BrowserContext* const browser_context_;
 
   // Map of site to SiteInstance, to ensure we only have one SiteInstance per
   // site.  The site string should be the possibly_invalid_spec() of a GURL
   // obtained with SiteInstanceImpl::GetSiteForURL.  Note that this map may not
   // contain every active SiteInstance, because a race exists where two
   // SiteInstances can be assigned to the same site.  This is ok in rare cases.
   // It also does not contain SiteInstances which have not yet been assigned a
   // site, such as about:blank.  See NavigatorImpl::ShouldAssignSiteForURL.
   SiteInstanceMap site_instance_map_;
 
   // Number of WebContentses currently using this BrowsingInstance.
   size_t active_contents_count_;
 
   SiteInstanceImpl* default_subframe_site_instance_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSING_INSTANCE_H_