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

chrome/browser/renderer_security_policy.cc

 // 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.
 
 #include "chrome/browser/renderer_security_policy.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
@@ skipping 54 matching lines @@
   //   |false| means the scheme has been revoked.
   // If a scheme is not present in the map, then it has never been granted
   // or revoked.
   SchemeMap scheme_policy_;
 
   // The set of files the renderer is permited to upload to the web.
   FileSet uploadable_files_;
 
   bool has_dom_ui_bindings_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RendererSecurityPolicy::SecurityState);
+  DISALLOW_COPY_AND_ASSIGN(SecurityState);
 };
 
 RendererSecurityPolicy::RendererSecurityPolicy() {
   // We know about these schemes and believe them to be safe.
   RegisterWebSafeScheme("http");
   RegisterWebSafeScheme("https");
   RegisterWebSafeScheme("ftp");
   RegisterWebSafeScheme("data");
   RegisterWebSafeScheme("feed");
 
@@ skipping 190 matching lines @@
 bool RendererSecurityPolicy::HasDOMUIBindings(int renderer_id) {
   AutoLock lock(lock_);
 
   SecurityStateMap::iterator state = security_state_.find(renderer_id);
   if (state == security_state_.end())
     return false;
 
   return state->second->has_dom_ui_bindings();
 }