Fix for the WebInputEventBuilderTest.TestMouseEventScale content_unittests failures on the DrMemory…

ui/gfx/display.h

 // 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.
 
 #ifndef UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 33 matching lines @@
   ~Display();
 
   // Returns the forced device scale factor, which is given by
   // "--force-device-scale-factor".
   static float GetForcedDeviceScaleFactor();
 
   // Indicates if a device scale factor is being explicitly enforced from the
   // command line via "--force-device-scale-factor".
   static bool HasForceDeviceScaleFactor();
 
+  // Resets the flag used to determine if a device scale factor is being forced
+  // from the command line via "--force-device-scale-factor", and thus ensures
+  // that the command line is reevaluated.
+  static void ResetForceDeviceScaleFactor();

[scottmg, 2015/03/10 23:02:01]

I think this should have a "ForTesting" suffix.

[ananta, 2015/03/10 23:31:57]

Done.

+
   // Sets/Gets unique identifier associated with the display.
   // -1 means invalid display and it doesn't not exit.
   int64 id() const { return id_; }
   void set_id(int64 id) { id_ = id; }
 
   // Gets/Sets the display's bounds in gfx::Screen's coordinates.
   const Rect& bounds() const { return bounds_; }
   void set_bounds(const Rect& bounds) { bounds_ = bounds; }
 
   // Gets/Sets the display's work area in gfx::Screen's coordinates.
@@ skipping 60 matching lines @@
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
   Rotation rotation_;
   TouchSupport touch_support_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_