Refactor AccelerometerReader to provide an Observer

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Index: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index 537a58cb6417d9d9a5e72be1a5b2533ee20de1b8..335074cc8c661b95c310211b6a8cf8fed1d9bf52 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -6,7 +6,6 @@
 
 #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"
@@ -23,6 +22,10 @@
 #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
@@ -57,8 +60,10 @@ class MaximizeModeControllerTest : public test::AshTestBase {
 
   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.
@@ -66,11 +71,13 @@ class MaximizeModeControllerTest : public test::AshTestBase {
         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();