summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 18:27:29 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 18:27:29 +0000
commit858ba41a265e6a03bb454209f635c79949616a0f (patch)
treede970c06de5ef2383e63eb0c1c4dbd938cf7d6f1
parentcd283402134a014536ef01dfa4e3667f39682e20 (diff)
downloadchromium_src-858ba41a265e6a03bb454209f635c79949616a0f.zip
chromium_src-858ba41a265e6a03bb454209f635c79949616a0f.tar.gz
chromium_src-858ba41a265e6a03bb454209f635c79949616a0f.tar.bz2
Roll to a version of LevelDB that doesn't depend on the old ref_counted.h and delete it.
R=levin@chromium.org BUG=77801 TEST=none Review URL: http://codereview.chromium.org/6771027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79865 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--base/base.gypi1
-rw-r--r--base/ref_counted.h13
3 files changed, 1 insertions, 15 deletions
diff --git a/DEPS b/DEPS
index bfac91d..6d1de40 100644
--- a/DEPS
+++ b/DEPS
@@ -64,7 +64,7 @@ deps = {
(Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@70",
"src/third_party/leveldb":
- (Var("googlecode_url") % "leveldb") + "/trunk@16",
+ (Var("googlecode_url") % "leveldb") + "/trunk@17",
"src/third_party/snappy/src":
(Var("googlecode_url") % "snappy") + "/trunk@21",
diff --git a/base/base.gypi b/base/base.gypi
index 502ebbd..3e0aa51 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -196,7 +196,6 @@
'rand_util.h',
'rand_util_posix.cc',
'rand_util_win.cc',
- 'ref_counted.h',
'resource_util.cc',
'resource_util.h',
'safe_strerror_posix.cc',
diff --git a/base/ref_counted.h b/base/ref_counted.h
deleted file mode 100644
index 5f23b29..0000000
--- a/base/ref_counted.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 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 BASE_REF_COUNTED_H_
-#define BASE_REF_COUNTED_H_
-#pragma once
-
-// FIXME: Remove this header when third_party/leveldb is fixed to not rely on
-// it.
-#include "base/memory/ref_counted.h"
-
-#endif // BASE_REF_COUNTED_H_