summaryrefslogtreecommitdiffstats
path: root/sync/syncable
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 17:52:44 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 17:52:44 +0000
commit14c1c23d5a714bbf1769ecae6562a97f3b82fd82 (patch)
tree06e02c7760bb3dfc4a563c5149cc99dba8056389 /sync/syncable
parente040c24bb90563eb76c7a521ad485499d5217641 (diff)
downloadchromium_src-14c1c23d5a714bbf1769ecae6562a97f3b82fd82.zip
chromium_src-14c1c23d5a714bbf1769ecae6562a97f3b82fd82.tar.gz
chromium_src-14c1c23d5a714bbf1769ecae6562a97f3b82fd82.tar.bz2
Rename base/hash_tables to base/containers/hash_tables.
Remove forwarding header BUG= R=avi@chromium.org Review URL: https://codereview.chromium.org/16667019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/syncable')
-rw-r--r--sync/syncable/directory.h2
-rw-r--r--sync/syncable/syncable_id.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index 66c2a24..e149ae3 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -11,9 +11,9 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
#include "base/file_util.h"
#include "base/gtest_prod_util.h"
-#include "base/hash_tables.h"
#include "sync/base/sync_export.h"
#include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
#include "sync/internal_api/public/util/weak_handle.h"
diff --git a/sync/syncable/syncable_id.h b/sync/syncable/syncable_id.h
index 9fe4bdc..bbfeb93 100644
--- a/sync/syncable/syncable_id.h
+++ b/sync/syncable/syncable_id.h
@@ -10,8 +10,8 @@
#include <sstream>
#include <string>
+#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
-#include "base/hash_tables.h"
#include "sync/base/sync_export.h"
class MockConnectionManager;