Move cc::DisplayItemList and related classes into cc/paint/

cc/base/rtree.h

Index: cc/base/rtree.h
diff --git a/cc/base/rtree.h b/cc/base/rtree.h
index 31250b2e8103c27e57fdcec93353069a6b8789e9..3a19c29ac3d4545fad75b15e5b4918ccda113e50 100644
--- a/cc/base/rtree.h
+++ b/cc/base/rtree.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "cc/base/cc_export.h"
+#include "cc/base/base_export.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
@@ -35,7 +35,7 @@ namespace cc {
 //  Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990).
 //  "The R*-tree: an efficient and robust access method for points and
 //  rectangles"
-class CC_EXPORT RTree {
+class CC_BASE_EXPORT RTree {
  public:
   RTree();
   ~RTree();
@@ -135,6 +135,8 @@ class CC_EXPORT RTree {
   size_t num_data_elements_;
   Branch root_;
   std::vector<Node> nodes_;
+
+  DISALLOW_COPY_AND_ASSIGN(RTree);
 };
 
 }  // namespace cc