Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_exceptions_window_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "app/table_model_observer.h"
 #include "base/command_line.h"
@@ skipping 31 matching lines @@
 - (NSString*)stringForObjectValue:(id)object {
   if (![object isKindOfClass:[NSString class]])
     return nil;
   return object;
 }
 
 - (BOOL)getObjectValue:(id*)object
              forString:(NSString*)string
       errorDescription:(NSString**)error {
   if ([string length]) {
-      if (HostContentSettingsMap::Pattern(
+      if (ContentSettingsPattern(
           base::SysNSStringToUTF8(string)).IsValid()) {
       *object = string;
       return YES;
     }
   }
   if (error)
     *error = @"Invalid pattern";
   return NO;
 }
 
@@ skipping 225 matching lines @@
 }
 
 - (IBAction)addException:(id)sender {
   if (newException_.get()) {
     // The invariant is that |newException_| is non-NULL exactly if the pattern
     // of a new exception is currently being edited - so there's nothing to do
     // in that case.
     return;
   }
   newException_.reset(new HostContentSettingsMap::PatternSettingPair);
-  newException_->first = HostContentSettingsMap::Pattern(
+  newException_->first = ContentSettingsPattern(
       l10n_util::GetStringUTF8(IDS_EXCEPTIONS_SAMPLE_PATTERN));
   newException_->second = CONTENT_SETTING_BLOCK;
   [tableView_ reloadData];
 
   [self adjustEditingButtons];
   int index = model_->RowCount();
   NSIndexSet* selectedSet = [NSIndexSet indexSetWithIndex:index];
   [tableView_ selectRowIndexes:selectedSet byExtendingSelection:NO];
   [tableView_ editColumn:0 row:index withEvent:nil select:YES];
 }
@@ skipping 102 matching lines @@
   HostContentSettingsMap::PatternSettingPair originalEntry =
       isNewRow ? *newException_ : model_->entry_at(row);
   HostContentSettingsMap::PatternSettingPair entry = originalEntry;
   bool isOtr =
       isNewRow ? 0 : model_->entry_is_off_the_record(row);
   bool wasOtr = isOtr;
 
   // Modify it.
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"pattern"]) {
-    entry.first = HostContentSettingsMap::Pattern(
-                      base::SysNSStringToUTF8(object));
+    entry.first = ContentSettingsPattern(base::SysNSStringToUTF8(object));
   }
   if ([identifier isEqualToString:@"action"]) {
     int index = [object intValue];
     entry.second = popup_model_->SettingForIndex(index);
   }
   if ([identifier isEqualToString:@"otr"]) {
     isOtr = [object intValue] != 0;
   }
 
   // Commit modification, if any.
@@ skipping 48 matching lines @@
 
   // The model caches its data, meaning we need to recreate it on every change.
   model_.reset(new ContentExceptionsTableModel(
       settingsMap_, otrSettingsMap_, settingsType_));
 
   [tableView_ reloadData];
   [self adjustEditingButtons];
 }
 
 @end