| 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 36314933729ee3748dc38f1b8b6381b04b1a1263..86a84971f5dbcc398fe0a6f51d97e4c9a5ff0627 100644
|
| --- a/ash/display/display_color_manager_chromeos_unittest.cc
|
| +++ b/ash/display/display_color_manager_chromeos_unittest.cc
|
| @@ -297,7 +297,8 @@ TEST_F(DisplayColorManagerTest, NoMatchProductID) {
|
| EXPECT_TRUE(
|
| base::MatchPattern(log_->GetActionsAndClear(), kResetGammaAction));
|
|
|
| - WaitOnColorCalibration();
|
| + // NOTE: If product_id == 0, there is no thread switching in Quirks or Display
|
| + // code, so we shouldn't call WaitOnColorCalibration().
|
| EXPECT_STREQ("", log_->GetActionsAndClear().c_str());
|
| }
|
|
|
|
|