So that ScopedPtrHashMap can be used by user outside of cc.

BUG=156199

Review URL: https://chromiumcodereview.appspot.com/23653002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220488 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/cc/resources/layer_tiling_data.h b/cc/resources/layer_tiling_data.h
index 51565eb..c5c9a74 100644
--- a/cc/resources/layer_tiling_data.h
+++ b/cc/resources/layer_tiling_data.h
@@ -9,10 +9,10 @@
 
 #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"
 
@@ -72,7 +72,7 @@ class CC_EXPORT LayerTilingData {
     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);
diff --git a/cc/resources/worker_pool.h b/cc/resources/worker_pool.h
index c26ed07..cc8c39f 100644
--- a/cc/resources/worker_pool.h
+++ b/cc/resources/worker_pool.h
@@ -10,12 +10,12 @@
 #include <vector>
 
 #include "base/cancelable_callback.h"
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_hash_map.h"
 
 namespace cc {
 namespace internal {
@@ -113,7 +113,7 @@ class CC_EXPORT WorkerPool {
   // dependencies pointing in the direction of the dependents. Each task
   // need to be assigned a unique priority and a run count that matches
   // the number of dependencies.
-  typedef ScopedPtrHashMap<internal::WorkerPoolTask*, internal::GraphNode>
+  typedef base::ScopedPtrHashMap<internal::WorkerPoolTask*, internal::GraphNode>
       GraphNodeMap;
   typedef GraphNodeMap TaskGraph;