1 files changed, 15 insertions, 15 deletions

diff --git a/chromium/net/tools/flip_server/acceptor_thread.h b/chromium/net/tools/flip_server/acceptor_thread.h
index f967fac94fa..bcaa43e3a11 100644
--- a/chromium/net/tools/flip_server/acceptor_thread.h
+++ b/chromium/net/tools/flip_server/acceptor_thread.h
@@ -11,7 +11,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/threading/simple_thread.h"
-#include "net/tools/flip_server/epoll_server.h"
+#include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/flip_server/sm_interface.h"
 #include "openssl/ssl.h"
 
@@ -28,25 +28,25 @@ struct SSLState;
 //    a bool cross threads - especially one which only is set once...
 class Notification {
  public:
-   explicit Notification(bool value) : value_(value) {}
-
-   void Notify() {
-     base::AutoLock al(lock_);
-     value_ = true;
-   }
-   bool HasBeenNotified() {
-     base::AutoLock al(lock_);
-     return value_;
-   }
-   bool value_;
-   base::Lock lock_;
+  explicit Notification(bool value) : value_(value) {}
+
+  void Notify() {
+    base::AutoLock al(lock_);
+    value_ = true;
+  }
+  bool HasBeenNotified() {
+    base::AutoLock al(lock_);
+    return value_;
+  }
+  bool value_;
+  base::Lock lock_;
 };
 
 class SMAcceptorThread : public base::SimpleThread,
                          public EpollCallbackInterface,
                          public SMConnectionPoolInterface {
  public:
-  SMAcceptorThread(FlipAcceptor *acceptor, MemoryCache* memory_cache);
+  SMAcceptorThread(FlipAcceptor* acceptor, MemoryCache* memory_cache);
   virtual ~SMAcceptorThread();
 
   // EpollCallbackInteface interface
@@ -65,7 +65,7 @@ class SMAcceptorThread : public base::SimpleThread,
   SMConnection* NewConnection();
   SMConnection* FindOrMakeNewSMConnection();
   void InitWorker();
-  void HandleConnection(int server_fd, struct sockaddr_in *remote_addr);
+  void HandleConnection(int server_fd, struct sockaddr_in* remote_addr);
   void AcceptFromListenFD();
 
   // Notify the Accept thread that it is time to terminate.