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

Unified Diff: ash/display/display_color_manager_chromeos_unittest.cc

Issue 2431853002: Remove built-in path check from Quirks (Closed)
Patch Set: Address review (const &) Created 4 years, 2 months 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/display/quirks_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_color_manager_chromeos_unittest.cc
diff --git a/ash/display/display_color_manager_chromeos_unittest.cc b/ash/display/display_color_manager_chromeos_unittest.cc
index 13fd26492d10e7f5a1c6e2e0aa3ac96a240129dd..157fd85b9d89122cec083779433c141f77921493 100644
--- a/ash/display/display_color_manager_chromeos_unittest.cc
+++ b/ash/display/display_color_manager_chromeos_unittest.cc
@@ -84,17 +84,11 @@ class QuirksManagerDelegateTestImpl : public quirks::QuirksManager::Delegate {
// Unused by these tests.
std::string GetApiKey() const override { return std::string(); }
- base::FilePath GetBuiltInDisplayProfileDirectory() const override {
+ base::FilePath GetDisplayProfileDirectory() const override {
return color_path_;
}
- // Unused by these tests.
- base::FilePath GetDownloadDisplayProfileDirectory() const override {
- return base::FilePath();
- }
-
- // |false| prevents attempts at Quirks Server contact.
- bool DevicePolicyEnabled() const override { return false; }
+ bool DevicePolicyEnabled() const override { return true; }
private:
~QuirksManagerDelegateTestImpl() override = default;
@@ -127,7 +121,7 @@ class DisplayColorManagerTest : public testing::Test {
.Append(FILE_PATH_LITERAL("display"))
.Append(FILE_PATH_LITERAL("test_data"));
path_override_.reset(new base::ScopedPathOverride(
- chromeos::DIR_DEVICE_COLOR_CALIBRATION_PROFILES, color_path_));
+ chromeos::DIR_DEVICE_DISPLAY_PROFILES, color_path_));
quirks::QuirksManager::Initialize(
std::unique_ptr<quirks::QuirksManager::Delegate>(
« no previous file with comments | « no previous file | chrome/browser/chromeos/display/quirks_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698