content_shell: Use a ThreadRestrictions::ScopedAllowWait for layout tests on Android.

base/threading/thread_restrictions.h

 // 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.
 
 #ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_
 #define BASE_THREADING_THREAD_RESTRICTIONS_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 
@@ skipping 28 matching lines @@
 }
 namespace chrome_browser_net {
 class Predictor;
 }
 namespace content {
 class BrowserGpuChannelHostFactory;
 class BrowserTestBase;
 class GLHelper;
 class GpuChannelHost;
 class RenderWidgetHelper;
+class ScopedAllowWaitForAndroidLayoutTests;
 class TextInputClientMac;
 }
 namespace dbus {
 class Bus;
 }
 namespace disk_cache {
 class BackendImpl;
 class InFlightIO;
 }
 namespace media {
@@ skipping 106 matching lines @@
   static void AssertSingletonAllowed() {}
   static void DisallowWaiting() {}
   static void AssertWaitAllowed() {}
 #endif
 
  private:
   // DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to jam or brettw first.
   // BEGIN ALLOWED USAGE.
   friend class content::BrowserTestBase;
   friend class content::RenderWidgetHelper;
+  friend class content::ScopedAllowWaitForAndroidLayoutTests;
   friend class ::HistogramSynchronizer;
   friend class ::ScopedAllowWaitForLegacyWebViewApi;
   friend class ::TestingAutomationProvider;
   friend class cc::CompletionEvent;
   friend class remoting::AutoThread;
   friend class MessagePumpDefault;
   friend class SequencedWorkerPool;
   friend class SimpleThread;
   friend class Thread;
   friend class ThreadTestHelper;
@@ skipping 46 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait);
   };
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions);
 };
 
 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_RESTRICTIONS_H_