Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/content_exceptions_table_model.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/content_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 12 matching lines @@
   if (off_the_record_map) {
     off_the_record_map->GetSettingsForOneType(type,
                                               "",
                                               &off_the_record_entries_);
   }
 }
 
 ContentExceptionsTableModel::~ContentExceptionsTableModel() {}
 
 void ContentExceptionsTableModel::AddException(
-    const HostContentSettingsMap::Pattern& original_pattern,
+    const ContentSettingsPattern& original_pattern,
     ContentSetting setting,
     bool is_off_the_record) {
   DCHECK(!is_off_the_record || off_the_record_map_);
 
   int insert_position =
       is_off_the_record ? RowCount() : static_cast<int>(entries_.size());
 
-  const HostContentSettingsMap::Pattern pattern(
+  const ContentSettingsPattern pattern(
       original_pattern.CanonicalizePattern());
 
   entries(is_off_the_record).push_back(
       HostContentSettingsMap::PatternSettingPair(pattern, setting));
   map(is_off_the_record)->SetContentSetting(pattern,
                                             content_type_,
                                             "",
                                             setting);
   if (observer_)
     observer_->OnItemsAdded(insert_position, 1);
@@ skipping 18 matching lines @@
   entries_.clear();
   off_the_record_entries_.clear();
   map_->ClearSettingsForOneType(content_type_);
   if (off_the_record_map_)
     off_the_record_map_->ClearSettingsForOneType(content_type_);
   if (observer_)
     observer_->OnItemsRemoved(0, old_row_count);
 }
 
 int ContentExceptionsTableModel::IndexOfExceptionByPattern(
-    const HostContentSettingsMap::Pattern& original_pattern,
+    const ContentSettingsPattern& original_pattern,
     bool is_off_the_record) {
   DCHECK(!is_off_the_record || off_the_record_map_);
 
   int offset =
       is_off_the_record ? static_cast<int>(entries_.size()) : 0;
 
-  const HostContentSettingsMap::Pattern pattern(
+  const ContentSettingsPattern pattern(
       original_pattern.CanonicalizePattern());
 
   // This is called on every key type in the editor. Move to a map if we end up
   // with lots of exceptions.
   for (size_t i = 0; i < entries(is_off_the_record).size(); ++i) {
     if (entries(is_off_the_record)[i].first == pattern)
       return offset + static_cast<int>(i);
   }
   return -1;
 }
@@ skipping 27 matching lines @@
     default:
       NOTREACHED();
   }
 
   return std::wstring();
 }
 
 void ContentExceptionsTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }