Refactor AccelerometerReader to provide an Observer

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

 // Copyright 2014 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 <math.h>
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
-#include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
 #include "base/command_line.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "ui/accelerometer/accelerometer_types.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 #include "ui/message_center/message_center.h"
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/accelerometer/accelerometer_reader.h"
+#endif
+
 #if defined(USE_X11)
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
 
 namespace ash {
 
 namespace {
 
 const float kDegreesToRadians = 3.1415926f / 180.0f;
 const float kMeanGravity = 9.8066f;
@@ skipping 14 matching lines @@
 extern const float kAccelerometerFullyOpenTestData[];
 extern const size_t kAccelerometerFullyOpenTestDataLength;
 
 class MaximizeModeControllerTest : public test::AshTestBase {
  public:
   MaximizeModeControllerTest() {}
   ~MaximizeModeControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
-    Shell::GetInstance()->accelerometer_controller()->RemoveObserver(
+#if defined(OS_CHROMEOS)
+    Shell::GetInstance()->accelerometer_reader()->RemoveObserver(
         maximize_mode_controller());
+#endif
 
     // Set the first display to be the internal display for the accelerometer
     // screen rotation tests.
     test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()).
         SetFirstDisplayAsInternalDisplay();
   }
 
+#if defined(OS_CHROMEOS)

[flackr, 2014/12/12 16:47:10]

Hmm, I think it's more readable to match this to the #if defined(OS_CHROMEOS)
around just the accelerometer_reader access in the SetUp rather than ifdef the
entire TearDown with only part of the SetUp ifdef'd

[jonross, 2014/12/12 19:03:25]

Done.

   void TearDown() override {
-    Shell::GetInstance()->accelerometer_controller()->AddObserver(
+    Shell::GetInstance()->accelerometer_reader()->AddObserver(
         maximize_mode_controller());
     test::AshTestBase::TearDown();
   }
+#endif
 
   MaximizeModeController* maximize_mode_controller() {
     return Shell::GetInstance()->maximize_mode_controller();
   }
 
   void TriggerLidUpdate(const gfx::Vector3dF& lid) {
     ui::AccelerometerUpdate update;
     update.Set(ui::ACCELEROMETER_SOURCE_SCREEN, lid.x(), lid.y(), lid.z());
     maximize_mode_controller()->OnAccelerometerUpdated(update);
   }
@@ skipping 577 matching lines @@
   // Would normally trigger an exit from maximize mode.
   OpenLidToAngle(90.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
 
   TriggerBaseAndLidUpdate(gfx::Vector3dF(-kMeanGravity, 0.0f, 0.0f),
                           gfx::Vector3dF(-kMeanGravity, 0.0f, 0.0f));
   EXPECT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
 }
 
 }  // namespace ash