Revert 225398 "Fix a threading bug in the brlapi basec braille c..."

trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h

Index: trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
===================================================================
--- trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h	(revision 225410)
+++ trunk/src/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h	(working copy)
@@ -52,9 +52,7 @@
   // Tries to connect and starts watching for new brlapi servers.
   // No-op if already called.
   void StartConnecting();
-  void StartWatchingSocketDirOnFileThread();
-  void OnSocketDirChangedOnFileThread(const base::FilePath& path, bool error);
-  void OnSocketDirChangedOnIOThread();
+  void OnSocketDirChanged(const base::FilePath& path, bool error);
   void TryToConnect();
   void ResetRetryConnectHorizon();
   void ScheduleTryToConnect();
@@ -65,11 +63,12 @@
   void DispatchKeyEvent(scoped_ptr<KeyEvent> event);
   void DispatchOnDisplayStateChanged(scoped_ptr<DisplayState> new_state);
 
+  LibBrlapiLoader libbrlapi_loader_;
   CreateBrlapiConnectionFunction create_brlapi_connection_function_;
 
   // Manipulated on the IO thread.
-  LibBrlapiLoader libbrlapi_loader_;
   scoped_ptr<BrlapiConnection> connection_;
+  base::FilePathWatcher file_path_watcher_;
   bool started_connecting_;
   bool connect_scheduled_;
   base::Time retry_connect_horizon_;
@@ -77,9 +76,6 @@
   // Manipulated on the UI thread.
   ObserverList<BrailleObserver> observers_;
 
-  // Manipulated on the FILE thread.
-  base::FilePathWatcher file_path_watcher_;
-
   friend struct DefaultSingletonTraits<BrailleControllerImpl>;
 
   DISALLOW_COPY_AND_ASSIGN(BrailleControllerImpl);