Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc

Index: chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
index 5806050dd034376717cb970628a9cf58835011e1..8321a3890ef721ae20141b8377280f4a90941924 100644
--- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
@@ -8,10 +8,18 @@
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
+#include "chrome/common/content_settings_component.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-TEST(OriginIdentifierValueMapTest, SetGetValue) {
+class OriginIdentifierValueMapTest : public testing::Test {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    InitContentSettingsComponent();
+  }
+};
+
+TEST_F(OriginIdentifierValueMapTest, SetGetValue) {
   content_settings::OriginIdentifierValueMap map;
 
   EXPECT_EQ(NULL,
@@ -55,7 +63,7 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) {
                                "resource_id"));
 }
 
-TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
+TEST_F(OriginIdentifierValueMapTest, SetDeleteValue) {
   content_settings::OriginIdentifierValueMap map;
 
   EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
@@ -109,7 +117,7 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
                                "java-plugin"));
 }
 
-TEST(OriginIdentifierValueMapTest, Clear) {
+TEST_F(OriginIdentifierValueMapTest, Clear) {
   content_settings::OriginIdentifierValueMap map;
   EXPECT_TRUE(map.empty());
 
@@ -141,7 +149,7 @@ TEST(OriginIdentifierValueMapTest, Clear) {
                                "java-plugin"));
 }
 
-TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {
+TEST_F(OriginIdentifierValueMapTest, ListEntryPrecedences) {
   content_settings::OriginIdentifierValueMap map;
 
   map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
@@ -170,14 +178,14 @@ TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {
   EXPECT_EQ(2, actual_value);
 }
 
-TEST(OriginIdentifierValueMapTest, IterateEmpty) {
+TEST_F(OriginIdentifierValueMapTest, IterateEmpty) {
   content_settings::OriginIdentifierValueMap map;
   scoped_ptr<content_settings::RuleIterator> rule_iterator(
       map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, std::string(), NULL));
   EXPECT_FALSE(rule_iterator->HasNext());
 }
 
-TEST(OriginIdentifierValueMapTest, IterateNonempty) {
+TEST_F(OriginIdentifierValueMapTest, IterateNonempty) {
   // Verify the precedence order.
   content_settings::OriginIdentifierValueMap map;
   ContentSettingsPattern pattern =