| Index: chrome/browser/metrics/metrics_log_unittest.cc
|
| diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
|
| index aae2b7fbd7769a1f04a932355976b872133f214f..44811988f0bc9e862c8e6a4550d3216536852519 100644
|
| --- a/chrome/browser/metrics/metrics_log_unittest.cc
|
| +++ b/chrome/browser/metrics/metrics_log_unittest.cc
|
| @@ -38,7 +38,6 @@
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "content/public/test/test_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/gfx/size.h"
|
| #include "url/gurl.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -85,10 +84,6 @@ const int64 kInstallDateExpected = 1373050800; // Computed from kInstallDate.
|
| const int64 kEnabledDate = 1373001211;
|
| const int64 kEnabledDateExpected = 1373000400; // Computed from kEnabledDate.
|
| const int kSessionId = 127;
|
| -const int kScreenWidth = 1024;
|
| -const int kScreenHeight = 768;
|
| -const int kScreenCount = 3;
|
| -const float kScreenScaleFactor = 2;
|
| const char kBrandForTesting[] = "brand_for_testing";
|
| const variations::ActiveGroupId kFieldTrialIds[] = {
|
| {37, 43},
|
| @@ -193,18 +188,6 @@ class TestMetricsLog : public MetricsLog {
|
| }
|
| }
|
|
|
| - virtual gfx::Size GetScreenSize() const OVERRIDE {
|
| - return gfx::Size(kScreenWidth, kScreenHeight);
|
| - }
|
| -
|
| - virtual float GetScreenDeviceScaleFactor() const OVERRIDE {
|
| - return kScreenScaleFactor;
|
| - }
|
| -
|
| - virtual int GetScreenCount() const OVERRIDE {
|
| - return kScreenCount;
|
| - }
|
| -
|
| // Scoped PrefsService, which may not be used if |prefs_ != &scoped_prefs|.
|
| TestingPrefServiceSimple scoped_prefs_;
|
| // Weak pointer to the PrefsService used by this log.
|
| @@ -290,10 +273,6 @@ class MetricsLogTest : public testing::Test {
|
|
|
| const metrics::SystemProfileProto::Hardware& hardware =
|
| system_profile.hardware();
|
| - EXPECT_EQ(kScreenWidth, hardware.primary_screen_width());
|
| - EXPECT_EQ(kScreenHeight, hardware.primary_screen_height());
|
| - EXPECT_EQ(kScreenScaleFactor, hardware.primary_screen_scale_factor());
|
| - EXPECT_EQ(kScreenCount, hardware.screen_count());
|
|
|
| EXPECT_TRUE(hardware.has_cpu());
|
| EXPECT_TRUE(hardware.cpu().has_vendor_name());
|
|
|