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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183116

Review URL: https://codereview.chromium.org/12217125

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183129 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 3 deletions

diff --git a/base/values.cc b/base/values.cc
index 3712d46..4768774 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -1000,13 +1000,13 @@ bool ListValue::Remove(const Value& value, size_t* index) {
   return false;
 }
 
-void ListValue::Erase(iterator iter, Value** out_value) {
+ListValue::iterator ListValue::Erase(iterator iter, Value** out_value) {
   if (out_value)
     *out_value = *iter;
   else
     delete *iter;
 
-  list_.erase(iter);
+  return list_.erase(iter);
 }
 
 void ListValue::Append(Value* in_value) {
diff --git a/base/values.h b/base/values.h
index bb23ffc..8c87844 100644
--- a/base/values.h
+++ b/base/values.h
@@ -453,7 +453,9 @@ class BASE_EXPORT ListValue : public Value {
 
   // Removes the element at |iter|. If |out_value| is NULL, the value will be
   // deleted, otherwise ownership of the value is passed back to the caller.
-  void Erase(iterator iter, Value** out_value);
+  // Returns an iterator pointing to the location of the element that
+  // followed the erased element.
+  iterator Erase(iterator iter, Value** out_value);
 
   // Appends a Value to the end of the list.
   void Append(Value* in_value);