Fix grouped history query range for months.

chrome/browser/ui/webui/browsing_history_handler.h

 // Copyright 2015 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 CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "base/time/clock.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/url_row.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/history/core/browser/web_history_service_observer.h"
 #include "components/sync/driver/sync_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "url/gurl.h"
 
@@ skipping 29 matching lines @@
   struct HistoryEntry {
     // Values indicating whether an entry represents only local visits, only
     // remote visits, or a mixture of both.
     enum EntryType {
       EMPTY_ENTRY = 0,
       LOCAL_ENTRY,
       REMOTE_ENTRY,
       COMBINED_ENTRY
     };
 
-    HistoryEntry(EntryType type, const GURL& url, const base::string16& title,
-                 base::Time time, const std::string& client_id,
-                 bool is_search_result, const base::string16& snippet,
-                 bool blocked_visit);
+    HistoryEntry(EntryType type,
+                 const GURL& url,
+                 const base::string16& title,
+                 base::Time time,
+                 const std::string& client_id,
+                 bool is_search_result,
+                 const base::string16& snippet,
+                 bool blocked_visit,
+                 base::Clock* clock);
     HistoryEntry();
     HistoryEntry(const HistoryEntry& other);
     virtual ~HistoryEntry();
 
     // Formats this entry's URL and title and adds them to |result|.
     void SetUrlAndTitle(base::DictionaryValue* result,
                         bool limit_title_length) const;
 
     // Converts the entry to a DictionaryValue to be owned by the caller.
     std::unique_ptr<base::DictionaryValue> ToValue(
@@ skipping 23 matching lines @@
     std::set<int64_t> all_timestamps;
 
     // If true, this entry is a search result.
     bool is_search_result;
 
     // The entry's search snippet, if this entry is a search result.
     base::string16 snippet;
 
     // Whether this entry was blocked when it was attempted.
     bool blocked_visit;
+
+    base::Clock* clock;

[Dan Beam, 2016/11/10 03:31:34]

can you note that this is a weak ref?

[calamity, 2016/11/10 07:16:27]

Done.

   };
 
   BrowsingHistoryHandler();
   ~BrowsingHistoryHandler() override;
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
   // SyncServiceObserver implementation.
   void OnStateChanged() override;
@@ skipping 15 matching lines @@
   // timestamps of the other visits.
   static void MergeDuplicateResults(
       std::vector<BrowsingHistoryHandler::HistoryEntry>* results);
 
  protected:
   // Callback from the history system when a history query has completed.
   // Exposed for testing.
   void QueryComplete(const base::string16& search_text,
                      const history::QueryOptions& options,
                      history::QueryResults* results);
 

[Dan Beam, 2016/11/10 03:31:34]

can you mention that this is basically just for testing?

[calamity, 2016/11/10 07:16:27]

Done.

+  void set_clock(std::unique_ptr<base::Clock> clock) {
+    clock_ = std::move(clock);
+  }
+
  private:
+  FRIEND_TEST_ALL_PREFIXES(BrowsingHistoryHandlerTest, SetQueryTimeInWeeks);
+  FRIEND_TEST_ALL_PREFIXES(BrowsingHistoryHandlerTest, SetQueryTimeInMonths);
+
   // The range for which to return results:
   // - ALLTIME: allows access to all the results in a paginated way.
   // - WEEK: the last 7 days.
   // - MONTH: the last calendar month.
   enum Range {
     ALL_TIME = 0,
     WEEK = 1,
     MONTH = 2
   };
 
@@ skipping 88 matching lines @@
   // ProfileSyncService observer listens to late initialization of history sync.
   ScopedObserver<browser_sync::ProfileSyncService, syncer::SyncServiceObserver>
       sync_service_observer_;
 
   // Whether the last call to Web History returned synced results.
   bool has_synced_results_;
 
   // Whether there are other forms of browsing history on the history server.
   bool has_other_forms_of_browsing_history_;
 
+  // The clock used to vend times.
+  std::unique_ptr<base::Clock> clock_;
+
   base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_