Enforce singleton not allowed behavior for CONTINUE_ON_SHUTDOWN tasks

base/test/test_support_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdarg.h>
 #include <string.h>
 
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 25 matching lines @@
   bool should_quit;
 };
 
 RunState* g_state = NULL;
 
 // A singleton WaitableEvent wrapper so we avoid a busy loop in
 // MessagePumpForUIStub. Other platforms use the native event loop which blocks
 // when there are no pending messages.
 class Waitable {
  public:
-  static Waitable* GetInstance() { return base::Singleton<Waitable>::get(); }
+  static Waitable* GetInstance() {
+    return base::Singleton<Waitable,
+                           base::LeakySingletonTraits<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 base::DefaultSingletonTraits<Waitable>;
 
   Waitable()
       : waitable_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                         base::WaitableEvent::InitialState::NOT_SIGNALED) {}
 
   base::WaitableEvent waitable_event_;
 
@@ skipping 114 matching lines @@
     LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
 }
 
 void InitAndroidTest() {
   if (!base::AndroidIsChildProcess()) {
     InitAndroidTestLogging();
   }
   InitAndroidTestMessageLoop();
 }
 }  // namespace base