Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/plugin_exceptions_table_model_unittest.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 "app/table_model_observer.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"
 #include "chrome/common/chrome_switches.h"
@@ skipping 47 matching lines @@
                       *CommandLine::ForCurrentProcess()) {}
 
   virtual void SetUp() {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableResourceContentSettings);
 
     profile_.reset(new TestingProfile());
 
     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 92 matching lines @@
   EXPECT_CALL(observer, OnModelChanged());
   RemoveRowsTableModel::Rows rows;
   rows.insert(0);
   table_model_->RemoveRows(rows);
   EXPECT_EQ(2, table_model_->RowCount());
   EXPECT_EQ(1, static_cast<int>(table_model_->GetGroups().size()));
   CheckInvariants();
 
   HostContentSettingsMap* map = profile_->GetHostContentSettingsMap();
   EXPECT_CALL(observer, OnModelChanged());
-  map->SetContentSetting(HostContentSettingsMap::Pattern("[*.]blurp.net"),
+  map->SetContentSetting(ContentSettingsPattern("[*.]blurp.net"),
                          CONTENT_SETTINGS_TYPE_PLUGINS,
                          "b-bar",
                          CONTENT_SETTING_BLOCK);
   EXPECT_EQ(3, table_model_->RowCount());
 
   InSequence s;
   EXPECT_CALL(observer, OnItemsRemoved(2, 1));
   EXPECT_CALL(observer, OnItemsRemoved(0, 1));
   rows.clear();
   rows.insert(0);
@@ skipping 12 matching lines @@
 
   EXPECT_CALL(observer, OnModelChanged());
   table_model_->RemoveAll();
   EXPECT_EQ(0, table_model_->RowCount());
   EXPECT_EQ(0, static_cast<int>(table_model_->GetGroups().size()));
   CheckInvariants();
   table_model_->SetObserver(NULL);
 }
 
 }  // namespace plugin_test_internal