13 files changed, 16 insertions, 16 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 6603ce6..7be1225 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -150,6 +150,7 @@
         'idle_timer.cc',
         'idle_timer.h',
         'idle_timer_none.cc',
+        'id_map.h',
         'image_util.cc',
         'image_util.h',
         'json_reader.cc',
@@ -579,6 +580,7 @@
         'histogram_unittest.cc',
         'hmac_unittest.cc',
         'idletimer_unittest.cc',
+        'id_map_unittest.cc',
         'json_reader_unittest.cc',
         'json_writer_unittest.cc',
         'lazy_instance_unittest.cc',
diff --git a/chrome/common/id_map.h b/base/id_map.h
index bf351b8..13fb2f2 100644
--- a/chrome/common/id_map.h
+++ b/base/id_map.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_ID_MAP_H_
-#define CHROME_COMMON_ID_MAP_H_
+#ifndef BASE_ID_MAP_H_
+#define BASE_ID_MAP_H_
 
 #include <set>
 
@@ -159,4 +159,4 @@ class IDMap {
   DISALLOW_COPY_AND_ASSIGN(IDMap);
 };
 
-#endif  // CHROME_COMMON_ID_MAP_H_
+#endif  // BASE_ID_MAP_H_
diff --git a/chrome/common/id_map_unittest.cc b/base/id_map_unittest.cc
index ed15cbe..7b12e35 100644
--- a/chrome/common/id_map_unittest.cc
+++ b/base/id_map_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/id_map.h"
+#include "base/id_map.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chrome_plugin_browsing_context.h b/chrome/browser/chrome_plugin_browsing_context.h
index d79f5d2..16499e8 100644
--- a/chrome/browser/chrome_plugin_browsing_context.h
+++ b/chrome/browser/chrome_plugin_browsing_context.h
@@ -7,8 +7,8 @@
 
 #include <map>
 
+#include "base/id_map.h"
 #include "chrome/common/chrome_plugin_api.h"
-#include "chrome/common/id_map.h"
 #include "chrome/common/notification_registrar.h"
 
 class URLRequestContext;
diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
index 20b9e81..4c12084 100644
--- a/chrome/browser/renderer_host/render_process_host.h
+++ b/chrome/browser/renderer_host/render_process_host.h
@@ -8,9 +8,9 @@
 #include <set>
 #include <string>
 
+#include "base/id_map.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/id_map.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/common/visitedlink_common.h"
 #include "ipc/ipc_sync_channel.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 69700e7..8371db4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -384,7 +384,6 @@
         'common/extensions/user_script.cc',
         'common/extensions/user_script.h',
         'common/gfx/utils.h',
-        'common/id_map.h',
         'common/net/cookie_monster_sqlite.cc',
         'common/net/cookie_monster_sqlite.h',
         'common/net/dns.h',
@@ -3982,7 +3981,6 @@
         'common/extensions/extension_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
-        'common/id_map_unittest.cc',
         'common/important_file_writer_unittest.cc',
         'common/json_value_serializer_unittest.cc',
         'common/mru_cache_unittest.cc',
@@ -4216,7 +4214,7 @@
       # Provides a syncapi dynamic library target from checked-in binaries,
       # or from compiling a stub implementation.
       'target_name': 'syncapi',
-      
+
       'conditions': [
         ['chrome_personalization==0', {
           # Empty target.
diff --git a/chrome/common/app_cache/app_cache_context_impl.h b/chrome/common/app_cache/app_cache_context_impl.h
index b9ed757..ec2f25f 100644
--- a/chrome/common/app_cache/app_cache_context_impl.h
+++ b/chrome/common/app_cache/app_cache_context_impl.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_APP_CACHE_APP_CACHE_CONTEXT_IMPL_H_
 #define CHROME_COMMON_APP_CACHE_APP_CACHE_CONTEXT_IMPL_H_
 
-#include "chrome/common/id_map.h"
+#include "base/id_map.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webappcachecontext.h"
 
diff --git a/chrome/common/app_cache/app_cache_dispatcher_host.h b/chrome/common/app_cache/app_cache_dispatcher_host.h
index 6de17a3..749e74a 100644
--- a/chrome/common/app_cache/app_cache_dispatcher_host.h
+++ b/chrome/common/app_cache/app_cache_dispatcher_host.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_APP_CACHE_APP_CACHE_DISPATCHER_HOST_H_
 #define CHROME_COMMON_APP_CACHE_APP_CACHE_DISPATCHER_HOST_H_
 
-#include "chrome/common/id_map.h"
+#include "base/id_map.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webappcachecontext.h"
 
diff --git a/chrome/common/db_message_filter.cc b/chrome/common/db_message_filter.cc
index 992ffad..cba4aea 100644
--- a/chrome/common/db_message_filter.cc
+++ b/chrome/common/db_message_filter.cc
@@ -5,12 +5,12 @@
 #include "db_message_filter.h"
 
 #include "base/atomic_sequence_num.h"
+#include "base/id_map.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/task.h"
 #include "chrome/common/child_process.h"
-#include "chrome/common/id_map.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/common/db_message_filter.h b/chrome/common/db_message_filter.h
index 4728400..1376db0 100644
--- a/chrome/common/db_message_filter.h
+++ b/chrome/common/db_message_filter.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_COMMON_DB_MESSAGE_FILTER_H_
 #define CHROME_COMMON_DB_MESSAGE_FILTER_H_
 
+#include "base/id_map.h"
 #include "base/scoped_ptr.h"
 #include "base/waitable_event.h"
-#include "chrome/common/id_map.h"
 #include "ipc/ipc_channel_proxy.h"
 
 class Lock;
diff --git a/chrome/common/message_router.h b/chrome/common/message_router.h
index ef648ab..ef18aaa 100644
--- a/chrome/common/message_router.h
+++ b/chrome/common/message_router.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_MESSAGE_ROUTER_H__
 #define CHROME_COMMON_MESSAGE_ROUTER_H__
 
-#include "chrome/common/id_map.h"
+#include "base/id_map.h"
 #include "ipc/ipc_channel.h"
 
 // The MessageRouter handles all incoming messages sent to it by routing them
diff --git a/chrome/renderer/audio_message_filter.h b/chrome/renderer/audio_message_filter.h
index ef3ecac..f714e1b 100644
--- a/chrome/renderer/audio_message_filter.h
+++ b/chrome/renderer/audio_message_filter.h
@@ -10,8 +10,8 @@
 #ifndef CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
 #define CHROME_RENDERER_AUDIO_MESSAGE_FILTER_H_
 
+#include "base/id_map.h"
 #include "base/shared_memory.h"
-#include "chrome/common/id_map.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 646b488..48923c4 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -13,11 +13,11 @@
 #include "base/file_path.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
+#include "base/id_map.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/common/id_map.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/view_types.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"