Even more test cleanup. Some fixes to non-test code.

chrome/browser/content_settings/content_settings_base_provider.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 "chrome/browser/content_settings/content_settings_base_provider.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 11 matching lines @@
   true,   // CONTENT_SETTINGS_TYPE_PLUGINS
   false,  // CONTENT_SETTINGS_TYPE_POPUPS
   false,  // Not used for Geolocation
   false,  // Not used for Notifications
 };
 
 }  // namespace
 
 namespace content_settings {
 
+ExtendedContentSettings::ExtendedContentSettings() {}
+
+ExtendedContentSettings::ExtendedContentSettings(
+    const ExtendedContentSettings& rhs)
+    : content_settings(rhs.content_settings),
+      content_settings_for_resources(rhs.content_settings_for_resources) {

[Nico, 2011/02/15 21:25:37]

this (can't rely on implicit copy constructors) is a bit of a bummer

[Elliot Glaysher, 2011/02/15 22:09:51]

map of string to map of pair of enum and string to arbitrary array?

We need to go deeper.

+}
+
+ExtendedContentSettings::~ExtendedContentSettings() {}
+
+BaseProvider::BaseProvider(bool is_otr)
+      : is_off_the_record_(is_otr) {

[Nico, 2011/02/15 21:25:37]

indent only 4

+}
+
+BaseProvider::~BaseProvider() {}
+
 bool BaseProvider::RequiresResourceIdentifier(
     ContentSettingsType content_type) const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableResourceContentSettings)) {
     return kRequiresResourceIdentifier[content_type];
   } else {
     return false;
   }
 }
 
@@ skipping 185 matching lines @@
   if (setting == CONTENT_SETTING_ASK &&
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay)) {
     return CONTENT_SETTING_BLOCK;
   }
   return setting;
 }
 
 }  // namespace content_settings