Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a.

test/test_support_android.cc

Index: test/test_support_android.cc
diff --git a/test/test_support_android.cc b/test/test_support_android.cc
index 11a08715249b3fe97fe4a1a412df00512cd2c5b7..5a02ef01d1344cb86ad03d9a79876e3805145cc5 100644
--- a/test/test_support_android.cc
+++ b/test/test_support_android.cc
@@ -39,27 +39,21 @@ RunState* g_state = NULL;
 // when there are no pending messages.
 class Waitable {
  public:
-   static Waitable* GetInstance() {
-     return Singleton<Waitable>::get();
-   }
+  static Waitable* GetInstance() { return base::Singleton<Waitable>::get(); }
 
-   // Signals that there are more work to do.
-   void Signal() {
-     waitable_event_.Signal();
-   }
+  // Signals that there are more work to do.
+  void Signal() { waitable_event_.Signal(); }
 
-   // Blocks until more work is scheduled.
-   void Block() {
-     waitable_event_.Wait();
-   }
+  // Blocks until more work is scheduled.
+  void Block() { waitable_event_.Wait(); }
 
-   void Quit() {
-     g_state->should_quit = true;
-     Signal();
+  void Quit() {
+    g_state->should_quit = true;
+    Signal();
    }
 
  private:
-  friend struct DefaultSingletonTraits<Waitable>;
+  friend struct base::DefaultSingletonTraits<Waitable>;
 
   Waitable()
       : waitable_event_(false, false) {