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

Unified Diff: ash/metrics/user_metrics_recorder_unittest.cc

Issue 2815043002: Removes ShellPort::IsRunningInMash() (Closed)
Patch Set: dont set instance_ in constructor Created 3 years, 8 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 | « ash/metrics/desktop_task_switch_metric_recorder_unittest.cc ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « ash/metrics/desktop_task_switch_metric_recorder_unittest.cc ('k') | ash/mus/bridge/shell_port_mash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698