diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 15:52:32 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 15:52:32 +0000 |
| commit | 17601874b0d11eb69c6c79d5816da02901735475 (patch) | |
| tree | da6b1251642046ef821277893e2fca695202a3dc /base/values.cc | |
| parent | 7061be9dea209a557dfcaa9cd300e0dc6cef16f8 (diff) | |
| download | chromium_src-17601874b0d11eb69c6c79d5816da02901735475.zip chromium_src-17601874b0d11eb69c6c79d5816da02901735475.tar.gz chromium_src-17601874b0d11eb69c6c79d5816da02901735475.tar.bz2 | |
Revert 183116
This change appears to have broken HistoryApiTest.DeleteProhibited on Win7 Tests (2).
> History: Pass min/max timestamps as query parameters to history server.
>
> Queries to the history server should match the same time range as the
> query to the history backend.
>
> Also de-dupe and sort results before handing them to the JS frontend.
>
> BUG=None
>
> Review URL: https://codereview.chromium.org/12217125
TBR=dubroy@chromium.org
Review URL: https://codereview.chromium.org/12304010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/values.cc')
| -rw-r--r-- | base/values.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/values.cc b/base/values.cc index 4768774..3712d46 100644 --- a/base/values.cc +++ b/base/values.cc @@ -1000,13 +1000,13 @@ bool ListValue::Remove(const Value& value, size_t* index) { return false; } -ListValue::iterator ListValue::Erase(iterator iter, Value** out_value) { +void ListValue::Erase(iterator iter, Value** out_value) { if (out_value) *out_value = *iter; else delete *iter; - return list_.erase(iter); + list_.erase(iter); } void ListValue::Append(Value* in_value) { |