| Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| index 6255d155af46bea6fb787cebeebb850db5ea2be8..d38e5723c070cac4bee2579337c74c09e1ed7b69 100644
|
| --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/test/display_manager_test_api.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_controller.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/prefs/scoped_user_pref_update.h"
|
| #include "base/prefs/testing_pref_service.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -674,18 +675,19 @@ TEST_F(DisplayPreferencesTest, DontSaveMaximizeModeControllerRotations) {
|
| gfx::Display::ROTATE_0);
|
|
|
| // Open up 270 degrees to trigger maximize mode
|
| - chromeos::AccelerometerUpdate update;
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, 0.0f, 0.0f,
|
| + scoped_refptr<chromeos::AccelerometerUpdate> update(
|
| + new chromeos::AccelerometerUpdate());
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, 0.0f, 0.0f,
|
| kMeanGravity);
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, 0.0f, -kMeanGravity, 0.0f);
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, 0.0f, -kMeanGravity, 0.0f);
|
| ash::MaximizeModeController* controller = shell->maximize_mode_controller();
|
| controller->OnAccelerometerUpdated(update);
|
| EXPECT_TRUE(controller->IsMaximizeModeWindowManagerEnabled());
|
|
|
| // Trigger 90 degree rotation
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, -kMeanGravity,
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, -kMeanGravity,
|
| 0.0f, 0.0f);
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, -kMeanGravity, 0.0f, 0.0f);
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, -kMeanGravity, 0.0f, 0.0f);
|
| controller->OnAccelerometerUpdated(update);
|
| shell->screen_orientation_controller()->OnAccelerometerUpdated(update);
|
| EXPECT_EQ(gfx::Display::ROTATE_90, display_manager->
|
| @@ -812,10 +814,11 @@ TEST_F(DisplayPreferencesTest, LoadRotationNoLogin) {
|
| EXPECT_EQ(gfx::Display::ROTATE_0, before_maximize_mode_rotation);
|
|
|
| // Open up 270 degrees to trigger maximize mode
|
| - chromeos::AccelerometerUpdate update;
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, 0.0f, 0.0f,
|
| + scoped_refptr<chromeos::AccelerometerUpdate> update(
|
| + new chromeos::AccelerometerUpdate());
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD, 0.0f, 0.0f,
|
| kMeanGravity);
|
| - update.Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, 0.0f, -kMeanGravity, 0.0f);
|
| + update->Set(chromeos::ACCELEROMETER_SOURCE_SCREEN, 0.0f, -kMeanGravity, 0.0f);
|
| ash::MaximizeModeController* maximize_mode_controller =
|
| shell->maximize_mode_controller();
|
| maximize_mode_controller->OnAccelerometerUpdated(update);
|
|
|