Reland "Encapsulate CSS selector declarative content condition tracking"

chrome/browser/extensions/api/declarative_content/content_condition.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_CONDITION_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_CONDITION_H_
 
-#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/values.h"
 #include "components/url_matcher/url_matcher.h"
 #include "extensions/browser/api/declarative/declarative_rule.h"
 
+namespace base {
+class Value;
+}
+
 namespace extensions {
 
+class Extension;
+
 struct RendererContentMatchData {
   RendererContentMatchData();
   ~RendererContentMatchData();
   // Match IDs for the URL of the top-level page the renderer is
   // returning data for.
   std::set<url_matcher::URLMatcherConditionSet::ID> page_url_matches;
   // All watched CSS selectors that match on frames with the same
   // origin as the page's main frame.
   base::hash_set<std::string> css_selectors;
 };
@@ skipping 71 matching lines @@
   std::vector<std::string> css_selectors_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentCondition);
 };
 
 typedef DeclarativeConditionSet<ContentCondition> ContentConditionSet;
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_CONDITION_H_