| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/display/display_color_manager_chromeos.h" | 5 #include "ash/display/display_color_manager_chromeos.h" |
| 6 | 6 |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/memory/scoped_vector.h" | |
| 10 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 11 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 12 #include "base/strings/pattern.h" | 11 #include "base/strings/pattern.h" |
| 13 #include "base/test/scoped_path_override.h" | 12 #include "base/test/scoped_path_override.h" |
| 14 #include "base/test/scoped_task_environment.h" | 13 #include "base/test/scoped_task_environment.h" |
| 15 #include "base/test/sequenced_worker_pool_owner.h" | 14 #include "base/test/sequenced_worker_pool_owner.h" |
| 16 #include "chromeos/chromeos_paths.h" | 15 #include "chromeos/chromeos_paths.h" |
| 17 #include "components/quirks/quirks_manager.h" | 16 #include "components/quirks/quirks_manager.h" |
| 18 #include "net/url_request/url_request_context_getter.h" | 17 #include "net/url_request/url_request_context_getter.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 configurator_.OnConfigurationChanged(); | 289 configurator_.OnConfigurationChanged(); |
| 291 EXPECT_TRUE(test_api_.TriggerConfigureTimeout()); | 290 EXPECT_TRUE(test_api_.TriggerConfigureTimeout()); |
| 292 EXPECT_TRUE( | 291 EXPECT_TRUE( |
| 293 base::MatchPattern(log_->GetActionsAndClear(), kResetGammaAction)); | 292 base::MatchPattern(log_->GetActionsAndClear(), kResetGammaAction)); |
| 294 | 293 |
| 295 WaitOnColorCalibration(); | 294 WaitOnColorCalibration(); |
| 296 EXPECT_STREQ("", log_->GetActionsAndClear().c_str()); | 295 EXPECT_STREQ("", log_->GetActionsAndClear().c_str()); |
| 297 } | 296 } |
| 298 | 297 |
| 299 } // namespace ash | 298 } // namespace ash |
| OLD | NEW |