Use base::Clock instead of base::Time::Now in AppSearchProvider.

chrome/browser/ui/app_list/search/app_search_provider.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/app_list/search/app_search_provider.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/clock.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/search/app_result.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
@@ skipping 19 matching lines @@
 
  private:
   const std::string app_id_;
   TokenizedString indexed_name_;
   base::Time last_launch_time_;
 
   DISALLOW_COPY_AND_ASSIGN(App);
 };
 
 AppSearchProvider::AppSearchProvider(Profile* profile,
-                                     AppListControllerDelegate* list_controller)
+                                     AppListControllerDelegate* list_controller,
+                                     scoped_ptr<base::Clock> clock)
     : profile_(profile),
       list_controller_(list_controller),
-      extension_registry_observer_(this) {
+      extension_registry_observer_(this),
+      clock_(clock.Pass()) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
   RefreshApps();
 }
 
 AppSearchProvider::~AppSearchProvider() {}
 
 void AppSearchProvider::Start(const base::string16& query) {
-  StartImpl(base::Time::Now(), query);
-}
+  query_ = query;
+  const TokenizedString query_terms(query);
 
-void AppSearchProvider::Stop() {
-}
-
-void AppSearchProvider::StartImpl(const base::Time& current_time,
-                                  const base::string16& query) {
-  query_ = query;
-  search_time_ = current_time;
+  ClearResults();
 
   bool show_recommendations = query.empty();
   // Refresh list of apps to ensure we have the latest launch time information.
   // This will also cause the results to update.
   if (show_recommendations)
     RefreshApps();
 
   UpdateResults();
 }

[Matt Giuca, 2014/12/10 07:16:12]

Accidentally deleted line?

[calamity, 2014/12/11 05:05:01]

Done.

-
 void AppSearchProvider::UpdateResults() {
   const TokenizedString query_terms(query_);
   bool show_recommendations = query_.empty();
   ClearResults();
 
   for (Apps::const_iterator app_it = apps_.begin();
        app_it != apps_.end();
        ++app_it) {
     scoped_ptr<AppResult> result(
         new AppResult(profile_, (*app_it)->app_id(), list_controller_));
     if (show_recommendations) {
       result->set_title((*app_it)->indexed_name().text());
-      result->UpdateFromLastLaunched(search_time_,
+      result->UpdateFromLastLaunched(clock_->Now(),
                                      (*app_it)->last_launch_time());
     } else {
       TokenizedStringMatch match;
       if (!match.Calculate(query_terms, (*app_it)->indexed_name()))
         continue;
 
       result->UpdateFromMatch((*app_it)->indexed_name(), match);
     }
     Add(result.Pass());
   }
 }
 
+void AppSearchProvider::Stop() {

[Matt Giuca, 2014/12/10 07:16:12]

Why did this move?

[calamity, 2014/12/11 05:05:01]

Fixed.

+}
+
 void AppSearchProvider::AddApps(const extensions::ExtensionSet& extensions) {
   extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
   for (extensions::ExtensionSet::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     const extensions::Extension* app = iter->get();
 
     if (!extensions::ui_util::ShouldDisplayInAppLauncher(app, profile_))
       continue;
 
     if (profile_->IsOffTheRecord() &&
@@ skipping 21 matching lines @@
 
 void AppSearchProvider::OnExtensionUninstalled(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UninstallReason reason) {
   RefreshApps();
   UpdateResults();
 }
 
 }  // namespace app_list