Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo…

chrome/browser/content_settings/content_settings_rule.h

Index: chrome/browser/content_settings/content_settings_rule.h
diff --git a/chrome/browser/content_settings/content_settings_rule.h b/chrome/browser/content_settings/content_settings_rule.h
deleted file mode 100644
index 934612d62d5c6883429083cd682af1ad09217723..0000000000000000000000000000000000000000
--- a/chrome/browser/content_settings/content_settings_rule.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2011 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.
-
-// Interface for objects providing content setting rules.
-
-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_RULE_H_
-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_RULE_H_
-
-#include "base/compiler_specific.h"
-#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "base/synchronization/lock.h"
-#include "base/values.h"
-#include "components/content_settings/core/common/content_settings_pattern.h"
-
-namespace content_settings {
-
-struct Rule {
-  Rule();
-  // Rule takes ownership of |value|.
-  Rule(const ContentSettingsPattern& primary_pattern,
-       const ContentSettingsPattern& secondary_pattern,
-       base::Value* value);
-  ~Rule();
-
-  ContentSettingsPattern primary_pattern;
-  ContentSettingsPattern secondary_pattern;
-  linked_ptr<base::Value> value;
-};
-
-class RuleIterator {
- public:
-  virtual ~RuleIterator();
-  virtual bool HasNext() const = 0;
-  virtual Rule Next() = 0;
-};
-
-class EmptyRuleIterator : public RuleIterator {
- public:
-  virtual ~EmptyRuleIterator();
-  virtual bool HasNext() const OVERRIDE;
-  virtual Rule Next() OVERRIDE;
-};
-
-class ConcatenationIterator : public RuleIterator {
- public:
-  // ConcatenationIterator takes ownership of the pointers in the |iterators|
-  // list and |auto_lock|. |auto_lock| can be NULL if no locking is needed.
-  ConcatenationIterator(ScopedVector<RuleIterator>* iterators,
-                        base::AutoLock* auto_lock);
-  virtual ~ConcatenationIterator();
-  virtual bool HasNext() const OVERRIDE;
-  virtual Rule Next() OVERRIDE;
- private:
-  ScopedVector<RuleIterator> iterators_;
-  scoped_ptr<base::AutoLock> auto_lock_;
-};
-
-}  // namespace content_settings
-
-#endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_RULE_H_