Revert 291214 "Fixes three crashes" in an attempt to find the cause of Athena related unit test fai…

trunk/src/athena/system/orientation_controller.h

Index: trunk/src/athena/system/orientation_controller.h
===================================================================
--- trunk/src/athena/system/orientation_controller.h	(revision 291393)
+++ trunk/src/athena/system/orientation_controller.h	(working copy)
@@ -28,22 +28,19 @@
  public:
   OrientationController();
 
-  void InitWith(scoped_refptr<base::TaskRunner> file_task_runner);
+  void InitWith(scoped_refptr<base::TaskRunner> io_task_runner);
 
-  void Shutdown();
-
  private:
   friend class base::RefCountedThreadSafe<OrientationController>;
 
   virtual ~OrientationController();
 
-  void ShutdownOnFILE();
-  // Watch for the socket path to be created, called on the FILE thread.
-  void WatchForSocketPathOnFILE();
-  void OnFilePathChangedOnFILE(const base::FilePath& path, bool error);
+  // Watch for the socket path to be created, called on the IO thread.
+  void WatchForSocketPathOnIO();
+  void OnFilePathChangedOnIO(const base::FilePath& path, bool error);
 
   // Overridden from device::DeviceSocketListener:
-  virtual void OnDataAvailableOnFILE(const void* data) OVERRIDE;
+  virtual void OnDataAvailableOnIO(const void* data) OVERRIDE;
 
   // Rotates the display to |rotation|, called on the UI thread.
   void RotateOnUI(gfx::Display::Rotation rotation);
@@ -54,17 +51,9 @@
   // The timestamp of the last applied orientation change.
   int64_t last_orientation_change_time_;
 
-  // True if the OrientaionController has already been shutdown.
-  // This is initialized on UI thread, but must be accessed / modified
-  // only on FILE thread.
-  bool shutdown_;
-
   // A task runner for the UI thread.
   scoped_refptr<base::TaskRunner> ui_task_runner_;
 
-  // A task runner for the FILE thread.
-  scoped_refptr<base::TaskRunner> file_task_runner_;
-
   // File path watcher used to detect when sensors are present.
   scoped_ptr<base::FilePathWatcher> watcher_;