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

cc/base/simple_enclosed_region.h

 // Copyright 2014 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 CC_BASE_SIMPLE_ENCLOSED_REGION_H_
 #define CC_BASE_SIMPLE_ENCLOSED_REGION_H_
 
 #include <stddef.h>
 
 #include <string>
 
-#include "cc/base/cc_export.h"
+#include "cc/base/base_export.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 class Region;
 
 // A constant-sized approximation of a Region. The SimpleEnclosedRegion may
 // exclude points in its approximation (may have false negatives) but will never
 // include a point that would not be in the actual Region (no false positives).
-class CC_EXPORT SimpleEnclosedRegion {
+class CC_BASE_EXPORT SimpleEnclosedRegion {
  public:
   SimpleEnclosedRegion() : rect_() {}
   SimpleEnclosedRegion(const SimpleEnclosedRegion& region)
       : rect_(region.rect_) {}
   explicit SimpleEnclosedRegion(const gfx::Rect& rect) : rect_(rect) {}
   SimpleEnclosedRegion(int x, int y, int w, int h) : rect_(x, y, w, h) {}
   SimpleEnclosedRegion(int w, int h) : rect_(w, h) {}
   explicit SimpleEnclosedRegion(const Region& region);
   ~SimpleEnclosedRegion();
 
@@ skipping 82 matching lines @@
     const SimpleEnclosedRegion& a,
     const SimpleEnclosedRegion& b) {
   SimpleEnclosedRegion result = a;
   result.Union(b);
   return result;
 }
 
 }  // namespace cc
 
 #endif  // CC_BASE_SIMPLE_ENCLOSED_REGION_H_