| Index: ash/metrics/user_metrics_recorder_unittest.cc
|
| diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc
|
| index 1a9731cf5c5c5b6e7e093b39bdca4cd5d94c7963..84993bede1cef92584b089d726cb3303a324d8d4 100644
|
| --- a/ash/metrics/user_metrics_recorder_unittest.cc
|
| +++ b/ash/metrics/user_metrics_recorder_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include <memory>
|
|
|
| #include "ash/login_status.h"
|
| +#include "ash/public/cpp/config.h"
|
| #include "ash/shelf/shelf_model.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_port.h"
|
| @@ -189,7 +190,7 @@ TEST_F(UserMetricsRecorderTest, VerifyStatsRecordedByRecordPeriodicMetrics) {
|
| // UserMetricsRecorder::RecordPeriodicMetrics() method.
|
| TEST_F(UserMetricsRecorderTest, ValuesRecordedByRecordShelfItemCounts) {
|
| // TODO: investigate failure in mash, http://crbug.com/695629.
|
| - if (ShellPort::Get()->IsRunningInMash())
|
| + if (Shell::GetAshConfig() == Config::MASH)
|
| return;
|
|
|
| test::TestShelfDelegate* test_shelf_delegate =
|
|
|