Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/renderer_security_policy.h

 // Copyright (c) 2006-2008 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_BROWSER_RENDERER_SECURITY_POLICY_H__
 #define CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
 
 #include <string>
 #include <map>
 #include <set>
@@ skipping 76 matching lines @@
   bool HasDOMUIBindings(int renderer_id);
 
  private:
   class SecurityState;
 
   typedef std::set<std::string> SchemeSet;
   typedef std::map<int, SecurityState*> SecurityStateMap;
 
   // Obtain an instance of RendererSecurityPolicy via GetInstance().
   RendererSecurityPolicy();
-  friend DefaultSingletonTraits<RendererSecurityPolicy>;
+  friend class DefaultSingletonTraits<RendererSecurityPolicy>;
 
   // You must acquire this lock before reading or writing any members of this
   // class.  You must not block while holding this lock.
   Lock lock_;
 
   // These schemes are white-listed for all renderers.  This set is protected
   // by |lock_|.
   SchemeSet web_safe_schemes_;
 
   // These schemes do not actually represent retrievable URLs.  For example,
   // the the URLs in the "about" scheme are aliases to other URLs.  This set is
   // protected by |lock_|.
   SchemeSet pseudo_schemes_;
 
   // This map holds a SecurityState for each renderer process.  The key for the
   // map is the ID of the RenderProcessHost.  The SecurityState objects are
   // owned by this object and are protected by |lock_|.  References to them must
   // not escape this class.
   SecurityStateMap security_state_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RendererSecurityPolicy);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__