Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/ui/cocoa/table_model_array_controller_unittest.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/table_model_array_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
@@ skipping 17 matching lines @@
 
   virtual void SetUp() {
     CocoaTest::SetUp();
 
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableResourceContentSettings);
 
     TestingProfile* profile = browser_helper_.profile();
     HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
 
-    HostContentSettingsMap::Pattern example_com("[*.]example.com");
-    HostContentSettingsMap::Pattern moose_org("[*.]moose.org");
+    ContentSettingsPattern example_com("[*.]example.com");
+    ContentSettingsPattern moose_org("[*.]moose.org");
     map->SetContentSetting(example_com,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "a-foo",
                            CONTENT_SETTING_ALLOW);
     map->SetContentSetting(moose_org,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "b-bar",
                            CONTENT_SETTING_BLOCK);
     map->SetContentSetting(example_com,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
@@ skipping 81 matching lines @@
 }
 
 TEST_F(TableModelArrayControllerTest, RemoveAll) {
   [controller_.get() removeAll:nil];
   EXPECT_EQ(0u, [[controller_.get() arrangedObjects] count]);
 }
 
 TEST_F(TableModelArrayControllerTest, AddException) {
   TestingProfile* profile = browser_helper_.profile();
   HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
-  HostContentSettingsMap::Pattern example_com("[*.]example.com");
+  ContentSettingsPattern example_com("[*.]example.com");
   map->SetContentSetting(example_com,
                          CONTENT_SETTINGS_TYPE_PLUGINS,
                          "c-blurp",
                          CONTENT_SETTING_BLOCK);
 
   NSArrayController* controller = controller_.get();
   NSArray* titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    FooPlugin,\n"
               @"    \"[*.]example.com\",\n"
@@ skipping 11 matching lines @@
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
               @"    \"[*.]example.com\",\n"
               @"    \"[*.]moose.org\"\n"
               @")",
               [titles description]);
 }
 
 }  // namespace