Enforce singleton not allowed behavior for CONTINUE_ON_SHUTDOWN tasks

base/test/test_support_android.cc

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