Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 11 matching lines @@
 #include "base/utf_string_conversions.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/character_encoding.h"
+#include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/external_protocol_handler.h"
@@ skipping 3088 matching lines @@
       render_view_host()->SyncRendererPrefs();
       break;
     }
 #endif
 
     case NotificationType::USER_STYLE_SHEET_UPDATED:
       UpdateWebPreferences();
       break;
 
     case NotificationType::CONTENT_SETTINGS_CHANGED: {
-      Details<const HostContentSettingsMap::ContentSettingsDetails>
-          settings_details(details);
+      Details<const ContentSettingsDetails> settings_details(details);
       NavigationEntry* entry = controller_.GetActiveEntry();
       GURL entry_url;
       if (entry)
         entry_url = entry->url();
       if (settings_details.ptr()->update_all() ||
           settings_details.ptr()->pattern().Matches(entry_url)) {
         render_view_host()->SendContentSettings(entry_url,
             profile()->GetHostContentSettingsMap()->
                 GetContentSettings(entry_url));
       }
@@ skipping 83 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }