Move ScopedPtrHashMap from cc to base

cc/resources/layer_tiling_data.h

 // Copyright 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.
 
 #ifndef CC_RESOURCES_LAYER_TILING_DATA_H_
 #define CC_RESOURCES_LAYER_TILING_DATA_H_
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "cc/base/scoped_ptr_hash_map.h"
 #include "cc/base/tiling_data.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class CC_EXPORT LayerTilingData {
  public:
   enum BorderTexelOption {
     HAS_BORDER_TEXELS,
     NO_BORDER_TEXELS
@@ skipping 39 matching lines @@
 
     gfx::Rect opaque_rect() const { return opaque_rect_; }
     void set_opaque_rect(gfx::Rect opaque_rect) { opaque_rect_ = opaque_rect; }
    private:
     int i_;
     int j_;
     gfx::Rect opaque_rect_;
     DISALLOW_COPY_AND_ASSIGN(Tile);
   };
   typedef std::pair<int, int> TileMapKey;
-  typedef ScopedPtrHashMap<TileMapKey, Tile> TileMap;
+  typedef base::ScopedPtrHashMap<TileMapKey, Tile> TileMap;
 
   void AddTile(scoped_ptr<Tile> tile, int i, int j);
   scoped_ptr<Tile> TakeTile(int i, int j);
   Tile* TileAt(int i, int j) const;
   const TileMap& tiles() const { return tiles_; }
 
   void SetBounds(gfx::Size size);
   gfx::Size bounds() const { return tiling_data_.total_size(); }
 
   void ContentRectToTileIndices(gfx::Rect rect,
@@ skipping 12 matching lines @@
 
   TileMap tiles_;
   TilingData tiling_data_;
 
   DISALLOW_COPY(LayerTilingData);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_LAYER_TILING_DATA_H_