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

chrome/browser/content_settings/content_settings_base_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_BASE_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_BASE_PROVIDER_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 
 namespace content_settings {
 
 typedef std::pair<ContentSettingsType, std::string>
     ContentSettingsTypeResourceIdentifierPair;
 typedef std::map<ContentSettingsTypeResourceIdentifierPair, ContentSetting>
     ResourceContentSettings;
 
 struct ExtendedContentSettings {
+  ExtendedContentSettings();
+  ExtendedContentSettings(const ExtendedContentSettings& rhs);
+  ~ExtendedContentSettings();
+
   ContentSettings content_settings;
   ResourceContentSettings content_settings_for_resources;
 };
 
 // Map for ContentSettings.
 typedef std::map<std::string, ExtendedContentSettings> HostContentSettings;
 
 // BaseProvider is the abstract base class for all content-settings-provider
 // classes.
 class BaseProvider : public ProviderInterface {
  public:
   // Maps CONTENT_SETTING_ASK for the CONTENT_SETTINGS_TYPE_PLUGINS to
   // CONTENT_SETTING_BLOCK if click-to-play is not enabled.
   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;
 
   // ProviderInterface Implementation
   virtual bool ContentSettingsTypeIsManaged(
       ContentSettingsType content_type) = 0;
 
   virtual ContentSetting GetContentSetting(
       const GURL& requesting_url,
@@ skipping 61 matching lines @@
   HostContentSettings off_the_record_settings_;
 
   // Used around accesses to the content_settings_ object to guarantee
   // thread safety.
   mutable base::Lock lock_;
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_BASE_PROVIDER_H_