diff --git a/base/base.gyp b/base/base.gyp
index 731bbf9727b78e..a1c1156b50a411 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -463,6 +463,7 @@
         'callback_unittest.nc',
         'cancelable_callback_unittest.cc',
         'command_line_unittest.cc',
+        'containers/hash_tables_unittest.cc',
         'containers/linked_list_unittest.cc',
         'containers/mru_cache_unittest.cc',
         'containers/small_map_unittest.cc',
diff --git a/base/containers/hash_tables.h b/base/containers/hash_tables.h
index 13d413b65ed659..0615e0dd337757 100644
--- a/base/containers/hash_tables.h
+++ b/base/containers/hash_tables.h
@@ -21,6 +21,9 @@
 #ifndef BASE_CONTAINERS_HASH_TABLES_H_
 #define BASE_CONTAINERS_HASH_TABLES_H_
 
+#include <utility>
+
+#include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 
@@ -117,4 +120,146 @@ using BASE_HASH_NAMESPACE::hash_multiset;
 using BASE_HASH_NAMESPACE::hash_set;
 }
 
+
+// Implement methods for hashing a pair of integers, so they can be used as
+// keys in STL containers.
+
+#if defined(COMPILER_MSVC)
+
+#define DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) \
+    template<> \
+    inline std::size_t hash_value<std::pair<type1, type2> >( \
+        const std::pair<type1, type2>& value)
+
+#define DEFINE_PAIR_HASH_FUNCTION_END()
+
+#elif defined(COMPILER_GCC)
+
+#define DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) \
+    template<> \
+    struct hash<std::pair<type1, type2> > { \
+      std::size_t operator()(std::pair<type1, type2> value) const
+
+#define DEFINE_PAIR_HASH_FUNCTION_END() \
+    };
+
+#else
+#error define DEFINE_PAIR_HASH_FUNCTION_START for your compiler
+#endif  // COMPILER
+
+namespace BASE_HASH_NAMESPACE {
+
+// Implement hashing for pairs of at-most 32 bit integer values.
+// When size_t is 32 bits, we turn the 64-bit hash code into 32 bits by using
+// multiply-add hashing. This algorithm, as described in
+// Theorem 4.3.3 of the thesis "Über die Komplexität der Multiplikation in
+// eingeschränkten Branchingprogrammmodellen" by Woelfel, is:
+//
+//   h32(x32, y32) = (h64(x32, y32) * rand_odd64 + rand16 * 2^16) % 2^64 / 2^32
+//
+// Contact danakj@chromium.org for any questions.
+#define DEFINE_32BIT_PAIR_HASH(type1, type2) \
+    DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) { \
+      uint64 first = value.first; \
+      uint32 second = value.second; \
+      uint64 hash64 = (first << 32) | second; \
+      \
+      if (sizeof(std::size_t) >= sizeof(uint64)) \
+        return static_cast<std::size_t>(hash64); \
+      \
+      uint64 odd_random = 481046412LL << 32 | 1025306954LL; \
+      uint32 shift_random = 10121U << 16; \
+      \
+      hash64 = hash64 * odd_random + shift_random; \
+      std::size_t high_bits = static_cast<std::size_t>( \
+          hash64 >> (sizeof(uint64) - sizeof(std::size_t))); \
+      return high_bits; \
+    } \
+  DEFINE_PAIR_HASH_FUNCTION_END();
+
+DEFINE_32BIT_PAIR_HASH(int16, int16);
+DEFINE_32BIT_PAIR_HASH(int16, uint16);
+DEFINE_32BIT_PAIR_HASH(int16, int32);
+DEFINE_32BIT_PAIR_HASH(int16, uint32);
+DEFINE_32BIT_PAIR_HASH(uint16, int16);
+DEFINE_32BIT_PAIR_HASH(uint16, uint16);
+DEFINE_32BIT_PAIR_HASH(uint16, int32);
+DEFINE_32BIT_PAIR_HASH(uint16, uint32);
+DEFINE_32BIT_PAIR_HASH(int32, int16);
+DEFINE_32BIT_PAIR_HASH(int32, uint16);
+DEFINE_32BIT_PAIR_HASH(int32, int32);
+DEFINE_32BIT_PAIR_HASH(int32, uint32);
+DEFINE_32BIT_PAIR_HASH(uint32, int16);
+DEFINE_32BIT_PAIR_HASH(uint32, uint16);
+DEFINE_32BIT_PAIR_HASH(uint32, int32);
+DEFINE_32BIT_PAIR_HASH(uint32, uint32);
+
+#undef DEFINE_32BIT_PAIR_HASH
+
+// Implement hashing for pairs of up-to 64-bit integer values.
+// We use the compound integer hash method to produce a 64-bit hash code, by
+// breaking the two 64-bit inputs into 4 32-bit values:
+// http://opendatastructures.org/versions/edition-0.1d/ods-java/node33.html#SECTION00832000000000000000
+// Then we reduce our result to 32 bits if required, similar to above.
+#define DEFINE_64BIT_PAIR_HASH(type1, type2) \
+    DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) { \
+      uint32 short_random1 = 842304669U; \
+      uint32 short_random2 = 619063811U; \
+      uint32 short_random3 = 937041849U; \
+      uint32 short_random4 = 3309708029U; \
+      \
+      uint64 value1 = value.first; \
+      uint64 value2 = value.second; \
+      uint32 value1a = static_cast<uint32>(value1 & 0xffffffff); \
+      uint32 value1b = static_cast<uint32>((value1 >> 32) & 0xffffffff); \
+      uint32 value2a = static_cast<uint32>(value2 & 0xffffffff); \
+      uint32 value2b = static_cast<uint32>((value2 >> 32) & 0xffffffff); \
+      \
+      uint64 product1 = static_cast<uint64>(value1a) * short_random1; \
+      uint64 product2 = static_cast<uint64>(value1b) * short_random2; \
+      uint64 product3 = static_cast<uint64>(value2a) * short_random3; \
+      uint64 product4 = static_cast<uint64>(value2b) * short_random4; \
+      \
+      uint64 hash64 = product1 + product2 + product3 + product4; \
+      \
+      if (sizeof(std::size_t) >= sizeof(uint64)) \
+        return static_cast<std::size_t>(hash64); \
+      \
+      uint64 odd_random = 1578233944LL << 32 | 194370989LL; \
+      uint32 shift_random = 20591U << 16; \
+      \
+      hash64 = hash64 * odd_random + shift_random; \
+      std::size_t high_bits = static_cast<std::size_t>( \
+          hash64 >> (sizeof(uint64) - sizeof(std::size_t))); \
+      return high_bits; \
+    } \
+  DEFINE_PAIR_HASH_FUNCTION_END();
+
+DEFINE_64BIT_PAIR_HASH(int16, int64);
+DEFINE_64BIT_PAIR_HASH(int16, uint64);
+DEFINE_64BIT_PAIR_HASH(uint16, int64);
+DEFINE_64BIT_PAIR_HASH(uint16, uint64);
+DEFINE_64BIT_PAIR_HASH(int32, int64);
+DEFINE_64BIT_PAIR_HASH(int32, uint64);
+DEFINE_64BIT_PAIR_HASH(uint32, int64);
+DEFINE_64BIT_PAIR_HASH(uint32, uint64);
+DEFINE_64BIT_PAIR_HASH(int64, int16);
+DEFINE_64BIT_PAIR_HASH(int64, uint16);
+DEFINE_64BIT_PAIR_HASH(int64, int32);
+DEFINE_64BIT_PAIR_HASH(int64, uint32);
+DEFINE_64BIT_PAIR_HASH(int64, int64);
+DEFINE_64BIT_PAIR_HASH(int64, uint64);
+DEFINE_64BIT_PAIR_HASH(uint64, int16);
+DEFINE_64BIT_PAIR_HASH(uint64, uint16);
+DEFINE_64BIT_PAIR_HASH(uint64, int32);
+DEFINE_64BIT_PAIR_HASH(uint64, uint32);
+DEFINE_64BIT_PAIR_HASH(uint64, int64);
+DEFINE_64BIT_PAIR_HASH(uint64, uint64);
+
+#undef DEFINE_64BIT_PAIR_HASH
+}
+
+#undef DEFINE_PAIR_HASH_FUNCTION_START
+#undef DEFINE_PAIR_HASH_FUNCTION_END
+
 #endif  // BASE_CONTAINERS_HASH_TABLES_H_
diff --git a/cc/base/hash_pair_unittest.cc b/base/containers/hash_tables_unittest.cc
similarity index 94%
rename from cc/base/hash_pair_unittest.cc
rename to base/containers/hash_tables_unittest.cc
index ad16761c2702f5..65724ecae224d6 100644
--- a/cc/base/hash_pair_unittest.cc
+++ b/base/containers/hash_tables_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#include "cc/base/hash_pair.h"
+#include "base/containers/hash_tables.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/base/hash_pair.h b/cc/base/hash_pair.h
deleted file mode 100644
index 586d78141a5c29..00000000000000
--- a/cc/base/hash_pair.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright (c) 2012 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.
-//
-// Defines methods for hashing a pair of integers.
-
-#ifndef CC_BASE_HASH_PAIR_H_
-#define CC_BASE_HASH_PAIR_H_
-
-#include <utility>
-
-#include "base/basictypes.h"
-#include "base/containers/hash_tables.h"
-
-#if defined(COMPILER_MSVC)
-
-#define DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) \
-    template<> \
-    inline std::size_t hash_value<std::pair<type1, type2> >( \
-        const std::pair<type1, type2>& value)
-
-#define DEFINE_PAIR_HASH_FUNCTION_END()
-
-#elif defined(COMPILER_GCC)
-
-#define DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) \
-    template<> \
-    struct hash<std::pair<type1, type2> > { \
-      std::size_t operator()(std::pair<type1, type2> value) const
-
-#define DEFINE_PAIR_HASH_FUNCTION_END() \
-    };
-
-#else
-#error define DEFINE_PAIR_HASH_FUNCTION_START for your compiler
-#endif  // COMPILER
-
-namespace BASE_HASH_NAMESPACE {
-
-// Implement hashing for pairs of at-most 32 bit integer values.
-// When size_t is 32 bits, we turn the 64-bit hash code into 32 bits by using
-// multiply-add hashing. This algorithm, as described in
-// Theorem 4.3.3 of the thesis "Über die Komplexität der Multiplikation in
-// eingeschränkten Branchingprogrammmodellen" by Woelfel, is:
-//
-//   h32(x32, y32) = (h64(x32, y32) * rand_odd64 + rand16 * 2^16) % 2^64 / 2^32
-
-#define DEFINE_32BIT_PAIR_HASH(type1, type2) \
-    DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) { \
-      uint64 first = value.first; \
-      uint32 second = value.second; \
-      uint64 hash64 = (first << 32) | second; \
-      \
-      if (sizeof(std::size_t) >= sizeof(uint64)) \
-        return static_cast<std::size_t>(hash64); \
-      \
-      uint64 odd_random = 481046412LL << 32 | 1025306954LL; \
-      uint32 shift_random = 10121U << 16; \
-      \
-      hash64 = hash64 * odd_random + shift_random; \
-      std::size_t high_bits = static_cast<std::size_t>( \
-          hash64 >> (sizeof(uint64) - sizeof(std::size_t))); \
-      return high_bits; \
-    } \
-  DEFINE_PAIR_HASH_FUNCTION_END();
-
-DEFINE_32BIT_PAIR_HASH(int16, int16);
-DEFINE_32BIT_PAIR_HASH(int16, uint16);
-DEFINE_32BIT_PAIR_HASH(int16, int32);
-DEFINE_32BIT_PAIR_HASH(int16, uint32);
-DEFINE_32BIT_PAIR_HASH(uint16, int16);
-DEFINE_32BIT_PAIR_HASH(uint16, uint16);
-DEFINE_32BIT_PAIR_HASH(uint16, int32);
-DEFINE_32BIT_PAIR_HASH(uint16, uint32);
-DEFINE_32BIT_PAIR_HASH(int32, int16);
-DEFINE_32BIT_PAIR_HASH(int32, uint16);
-DEFINE_32BIT_PAIR_HASH(int32, int32);
-DEFINE_32BIT_PAIR_HASH(int32, uint32);
-DEFINE_32BIT_PAIR_HASH(uint32, int16);
-DEFINE_32BIT_PAIR_HASH(uint32, uint16);
-DEFINE_32BIT_PAIR_HASH(uint32, int32);
-DEFINE_32BIT_PAIR_HASH(uint32, uint32);
-
-#undef DEFINE_32BIT_PAIR_HASH
-
-// Implement hashing for pairs of up-to 64-bit integer values.
-// We use the compound integer hash method to produce a 64-bit hash code, by
-// breaking the two 64-bit inputs into 4 32-bit values:
-// http://opendatastructures.org/versions/edition-0.1d/ods-java/node33.html#SECTION00832000000000000000
-// Then we reduce our result to 32 bits if required, similar to above.
-
-#define DEFINE_64BIT_PAIR_HASH(type1, type2) \
-    DEFINE_PAIR_HASH_FUNCTION_START(type1, type2) { \
-      uint32 short_random1 = 842304669U; \
-      uint32 short_random2 = 619063811U; \
-      uint32 short_random3 = 937041849U; \
-      uint32 short_random4 = 3309708029U; \
-      \
-      uint64 value1 = value.first; \
-      uint64 value2 = value.second; \
-      uint32 value1a = static_cast<uint32>(value1 & 0xffffffff); \
-      uint32 value1b = static_cast<uint32>((value1 >> 32) & 0xffffffff); \
-      uint32 value2a = static_cast<uint32>(value2 & 0xffffffff); \
-      uint32 value2b = static_cast<uint32>((value2 >> 32) & 0xffffffff); \
-      \
-      uint64 product1 = static_cast<uint64>(value1a) * short_random1; \
-      uint64 product2 = static_cast<uint64>(value1b) * short_random2; \
-      uint64 product3 = static_cast<uint64>(value2a) * short_random3; \
-      uint64 product4 = static_cast<uint64>(value2b) * short_random4; \
-      \
-      uint64 hash64 = product1 + product2 + product3 + product4; \
-      \
-      if (sizeof(std::size_t) >= sizeof(uint64)) \
-        return static_cast<std::size_t>(hash64); \
-      \
-      uint64 odd_random = 1578233944LL << 32 | 194370989LL; \
-      uint32 shift_random = 20591U << 16; \
-      \
-      hash64 = hash64 * odd_random + shift_random; \
-      std::size_t high_bits = static_cast<std::size_t>( \
-          hash64 >> (sizeof(uint64) - sizeof(std::size_t))); \
-      return high_bits; \
-    } \
-  DEFINE_PAIR_HASH_FUNCTION_END();
-
-DEFINE_64BIT_PAIR_HASH(int16, int64);
-DEFINE_64BIT_PAIR_HASH(int16, uint64);
-DEFINE_64BIT_PAIR_HASH(uint16, int64);
-DEFINE_64BIT_PAIR_HASH(uint16, uint64);
-DEFINE_64BIT_PAIR_HASH(int32, int64);
-DEFINE_64BIT_PAIR_HASH(int32, uint64);
-DEFINE_64BIT_PAIR_HASH(uint32, int64);
-DEFINE_64BIT_PAIR_HASH(uint32, uint64);
-DEFINE_64BIT_PAIR_HASH(int64, int16);
-DEFINE_64BIT_PAIR_HASH(int64, uint16);
-DEFINE_64BIT_PAIR_HASH(int64, int32);
-DEFINE_64BIT_PAIR_HASH(int64, uint32);
-DEFINE_64BIT_PAIR_HASH(int64, int64);
-DEFINE_64BIT_PAIR_HASH(int64, uint64);
-DEFINE_64BIT_PAIR_HASH(uint64, int16);
-DEFINE_64BIT_PAIR_HASH(uint64, uint16);
-DEFINE_64BIT_PAIR_HASH(uint64, int32);
-DEFINE_64BIT_PAIR_HASH(uint64, uint32);
-DEFINE_64BIT_PAIR_HASH(uint64, int64);
-DEFINE_64BIT_PAIR_HASH(uint64, uint64);
-
-#undef DEFINE_64BIT_PAIR_HASH
-}
-
-#undef DEFINE_PAIR_HASH_FUNCTION_START
-#undef DEFINE_PAIR_HASH_FUNCTION_END
-
-#endif  // CC_BASE_HASH_PAIR_H_
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 81c2bba346293a..0d344ac5635990 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -32,7 +32,6 @@
       'animation/transform_operations.cc',
       'animation/transform_operations.h',
       'base/completion_event.h',
-      'base/hash_pair.h',
       'base/math_util.cc',
       'base/math_util.h',
       'base/region.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index ad10da93d881a2..46617666f6bb98 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -13,7 +13,6 @@
       'animation/timing_function_unittest.cc',
       'animation/transform_operations_unittest.cc',
       'base/float_quad_unittest.cc',
-      'base/hash_pair_unittest.cc',
       'base/math_util_unittest.cc',
       'base/region_unittest.cc',
       'base/scoped_ptr_vector_unittest.cc',
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 14c657e8cfa292..f2885698098a95 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -11,7 +11,6 @@
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/hash_pair.h"
 #include "cc/base/scoped_ptr_hash_map.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "skia/ext/refptr.h"
@@ -111,6 +110,7 @@ class CC_EXPORT RenderPass {
  protected:
   RenderPass();
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(RenderPass);
 };
 
@@ -134,7 +134,7 @@ struct hash<cc::RenderPass::Id> {
 #else
 #error define a hash function for your compiler
 #endif  // COMPILER
-}
+}  // namespace BASE_HASH_NAMESPACE
 
 namespace cc {
 typedef ScopedPtrVector<RenderPass> RenderPassList;
diff --git a/cc/resources/layer_tiling_data.h b/cc/resources/layer_tiling_data.h
index 74cea0671bcd47..51565eba3b2b05 100644
--- a/cc/resources/layer_tiling_data.h
+++ b/cc/resources/layer_tiling_data.h
@@ -8,9 +8,9 @@
 #include <utility>
 
 #include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/hash_pair.h"
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_hash_map.h"
 #include "cc/base/tiling_data.h"
diff --git a/cc/resources/picture.h b/cc/resources/picture.h
index 93d326f8a0d015..6419b3418cfd3a 100644
--- a/cc/resources/picture.h
+++ b/cc/resources/picture.h
@@ -17,7 +17,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/hash_pair.h"
 #include "skia/ext/lazy_pixel_ref.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 6818868923f081..dad61343dcfddb 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -12,7 +12,6 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/hash_pair.h"
 #include "cc/base/region.h"
 #include "cc/base/tiling_data.h"
 #include "cc/resources/tile.h"
diff --git a/cc/resources/picture_pile_base.h b/cc/resources/picture_pile_base.h
index b39c228da3f295..fdb593fa81aa78 100644
--- a/cc/resources/picture_pile_base.h
+++ b/cc/resources/picture_pile_base.h
@@ -11,7 +11,6 @@
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/hash_pair.h"
 #include "cc/base/region.h"
 #include "cc/base/tiling_data.h"
 #include "cc/resources/picture.h"