Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: chrome/browser/ui/app_list/search/app_search_provider_unittest.cc

Issue 789623003: Use base::Clock instead of base::Time::Now in AppSearchProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@now_source
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index cfc815f62d07d0490d2540fd1e08d18130dea758..b5489360dad9755dec5bb0017b3f9d5a62948526 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/test/simple_test_clock.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/ui/app_list/app_list_test_util.h"
#include "chrome/browser/ui/app_list/search/app_search_provider.h"
@@ -37,11 +38,14 @@ class AppSearchProviderTest : public AppListTestBase {
void SetUp() override {
AppListTestBase::SetUp();
- app_search_.reset(new AppSearchProvider(profile_.get(), NULL));
+ scoped_ptr<base::SimpleTestClock> clock(new base::SimpleTestClock());
+ clock->SetNow(kTestCurrentTime);
+ app_search_.reset(
+ new AppSearchProvider(profile_.get(), NULL, clock.Pass()));
}
std::string RunQuery(const std::string& query) {
- app_search_->StartImpl(kTestCurrentTime, base::UTF8ToUTF16(query));
+ app_search_->Start(base::UTF8ToUTF16(query));
// Sort results by relevance.
std::vector<SearchResult*> sorted_results;
@@ -127,6 +131,13 @@ TEST_F(AppSearchProviderTest, FetchRecommendations) {
prefs->SetLastLaunchTime(kPackagedApp1Id, base::Time::FromInternalValue(10));
prefs->SetLastLaunchTime(kPackagedApp2Id, base::Time::FromInternalValue(20));
EXPECT_EQ("Packaged App 2,Packaged App 1,Hosted App", RunQuery(""));
+
+ // Times in the future should just be handled as highest priority.
+ prefs->SetLastLaunchTime(kHostedAppId,
+ kTestCurrentTime + base::TimeDelta::FromSeconds(5));
+ prefs->SetLastLaunchTime(kPackagedApp1Id, base::Time::FromInternalValue(10));
+ prefs->SetLastLaunchTime(kPackagedApp2Id, base::Time::FromInternalValue(0));
+ EXPECT_EQ("Hosted App,Packaged App 1,Packaged App 2", RunQuery(""));
}
} // namespace test

Powered by Google App Engine
This is Rietveld 408576698