Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/common/content_settings_pattern_parser_unittest.cc

 // Copyright (c) 2012 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/common/content_settings_pattern.h"
 #include "chrome/common/content_settings_pattern_parser.h"
 
+#include "chrome/common/content_settings_component.h"
+#include "chrome/common/content_settings_pattern.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 typedef ContentSettingsPattern::BuilderInterface BuilderInterface;
 }  // namespace
 
 class MockBuilder : public ContentSettingsPattern::BuilderInterface {
  public:
   MOCK_METHOD0(WithSchemeWildcard, BuilderInterface*());
   MOCK_METHOD0(WithDomainWildcard, BuilderInterface*());
   MOCK_METHOD0(WithPortWildcard, BuilderInterface*());
   MOCK_METHOD1(WithScheme, BuilderInterface*(const std::string& scheme));
   MOCK_METHOD1(WithHost, BuilderInterface*(const std::string& host));
   MOCK_METHOD1(WithPort, BuilderInterface*(const std::string& port));
   MOCK_METHOD1(WithPath, BuilderInterface*(const std::string& path));
   MOCK_METHOD0(WithPathWildcard, BuilderInterface*());
   MOCK_METHOD0(Invalid, BuilderInterface*());
   MOCK_METHOD0(Build, ContentSettingsPattern());
 };
 
 TEST(ContentSettingsPatternParserTest, ParsePatterns) {
+  InitContentSettingsComponent();

[Bernhard Bauer, 2014/08/18 15:55:13]

I would add this to ChromeTestSuite::Initialize() instead of every single test
that uses content settings.

[vasilii, 2014/08/20 08:44:06]

Done.

   // Test valid patterns
   ::testing::StrictMock<MockBuilder> builder;
 
   // WithPathWildcard() is not called for "*". (Need a strict Mock for this
   // case.)
   EXPECT_CALL(builder, WithSchemeWildcard()).Times(1).WillOnce(
       ::testing::Return(&builder));
   EXPECT_CALL(builder, WithDomainWildcard()).Times(1).WillOnce(
       ::testing::Return(&builder));
   EXPECT_CALL(builder, WithPortWildcard()).Times(1).WillOnce(
@@ skipping 105 matching lines @@
 
   EXPECT_CALL(builder, WithSchemeWildcard()).Times(1).WillOnce(
       ::testing::Return(&builder));
   EXPECT_CALL(builder, Invalid()).Times(1).WillOnce(
       ::testing::Return(&builder));
   content_settings::PatternParser::Parse("www.youtube.com*", &builder);
   ::testing::Mock::VerifyAndClear(&builder);
 }
 
 TEST(ContentSettingsPatternParserTest, ParseFilePatterns) {
+  InitContentSettingsComponent();
   ::testing::StrictMock<MockBuilder> builder;
 
   EXPECT_CALL(builder, WithScheme("file")).Times(1).WillOnce(
       ::testing::Return(&builder));
   EXPECT_CALL(builder, WithPath("/foo/bar/test.html")).Times(1).WillOnce(
       ::testing::Return(&builder));
   content_settings::PatternParser::Parse(
       "file:///foo/bar/test.html", &builder);
   ::testing::Mock::VerifyAndClear(&builder);
 
@@ skipping 37 matching lines @@
   EXPECT_CALL(builder, WithScheme("file")).Times(1).WillOnce(
       ::testing::Return(&builder));
   EXPECT_CALL(builder, Invalid()).Times(1).WillOnce(
       ::testing::Return(&builder));
   content_settings::PatternParser::Parse(
       "file://**", &builder);
   ::testing::Mock::VerifyAndClear(&builder);
 }
 
 TEST(ContentSettingsPatternParserTest, SerializePatterns) {
+  InitContentSettingsComponent();
   ContentSettingsPattern::PatternParts parts;
   parts.scheme = "http";
   parts.host = "www.youtube.com";
   parts.port = "8080";
   EXPECT_STREQ("http://www.youtube.com:8080",
                content_settings::PatternParser::ToString(parts).c_str());
 
   parts = ContentSettingsPattern::PatternParts();
   parts.scheme = "file";
   parts.path = "/foo/bar/test.html";
   EXPECT_STREQ("file:///foo/bar/test.html",
                content_settings::PatternParser::ToString(parts).c_str());
 
   parts = ContentSettingsPattern::PatternParts();
   parts.scheme = "file";
   parts.path = "";
   parts.is_path_wildcard = true;
   EXPECT_EQ("file:///*", content_settings::PatternParser::ToString(parts));
 }