Record device scale factor in the metrics log

chrome/browser/metrics/metrics_log_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/port.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 18 matching lines @@
 using tracked_objects::ProcessDataSnapshot;
 using tracked_objects::TaskSnapshot;
 
 namespace {
 
 const char kClientId[] = "bogus client ID";
 const int kSessionId = 127;
 const int kScreenWidth = 1024;
 const int kScreenHeight = 768;
 const int kScreenCount = 3;
+const float kScreenScaleFactor = 2;
 const chrome_variations::SelectedGroupId kFieldTrialIds[] = {
   {37, 43},
   {13, 47},
   {23, 17}
 };
 
 class TestMetricsLog : public MetricsLog {
  public:
   TestMetricsLog(const std::string& client_id, int session_id)
       : MetricsLog(client_id, session_id) {
@@ skipping 32 matching lines @@
 
     for (size_t i = 0; i < arraysize(kFieldTrialIds); ++i) {
       field_trial_ids->push_back(kFieldTrialIds[i]);
     }
   }
 
   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;
   }
 
   TestingPrefService prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestMetricsLog);
 };
 
 }  // namespace
@@ skipping 13 matching lines @@
     const metrics::SystemProfileProto& system_profile = log.system_profile();
     ASSERT_EQ(arraysize(kFieldTrialIds),
               static_cast<size_t>(system_profile.field_trial_size()));
     for (size_t i = 0; i < arraysize(kFieldTrialIds); ++i) {
       const metrics::SystemProfileProto::FieldTrial& field_trial =
           system_profile.field_trial(i);
       EXPECT_EQ(kFieldTrialIds[i].name, field_trial.name_id());
       EXPECT_EQ(kFieldTrialIds[i].group, field_trial.group_id());
     }
 
+    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());
+
     // TODO(isherman): Verify other data written into the protobuf as a result
     // of this call.
   }
 };
 
 TEST_F(MetricsLogTest, RecordEnvironment) {
   // Test that recording the environment works via both of the public methods
   // RecordEnvironment() and RecordEnvironmentProto().
   TestRecordEnvironment(false);
   TestRecordEnvironment(true);
@@ skipping 161 matching lines @@
   EXPECT_NE(std::string::npos,
             encoded.find(" childprocesscrashcount=\"10\""));
   EXPECT_EQ(std::string::npos,
             encoded.find(" otherusercrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" kernelcrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" systemuncleanshutdowns="));
 }
 #endif  // OS_CHROMEOS