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

chrome/browser/content_settings/content_settings_base_provider.h

Index: chrome/browser/content_settings/content_settings_base_provider.h
diff --git a/chrome/browser/content_settings/content_settings_base_provider.h b/chrome/browser/content_settings/content_settings_base_provider.h
index fa36a2e827b477103ca20e0ff132a0a6c9f1e47b..47a2b0983c7c094ec8c02a5e92b6337f75026a30 100644
--- a/chrome/browser/content_settings/content_settings_base_provider.h
+++ b/chrome/browser/content_settings/content_settings_base_provider.h
@@ -21,6 +21,10 @@ typedef std::map<ContentSettingsTypeResourceIdentifierPair, ContentSetting>
     ResourceContentSettings;
 
 struct ExtendedContentSettings {
+  ExtendedContentSettings();
+  ExtendedContentSettings(const ExtendedContentSettings& rhs);
+  ~ExtendedContentSettings();
+
   ContentSettings content_settings;
   ResourceContentSettings content_settings_for_resources;
 };
@@ -37,10 +41,8 @@ class BaseProvider : public ProviderInterface {
   static ContentSetting ClickToPlayFixup(ContentSettingsType content_type,
                                          ContentSetting setting);
 
-  explicit BaseProvider(bool is_otr)
-      : is_off_the_record_(is_otr) {
-  }
-  virtual ~BaseProvider() {}
+  explicit BaseProvider(bool is_otr);
+  virtual ~BaseProvider();
 
   // Initializes the Provider.
   virtual void Init() = 0;