Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro…

Source/WebKit/chromium/tests/CCThreadedTest.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 116 matching lines @@
     static void dispatchSetNeedsAnimateAndCommit(void* self);
     static void dispatchSetNeedsCommit(void* self);
     static void dispatchAcquireLayerTextures(void* self);
     static void dispatchSetNeedsRedraw(void* self);
     static void dispatchSetVisible(void* self);
     static void dispatchSetInvisible(void* self);
     static void dispatchComposite(void* self);
     static void dispatchDidAddAnimation(void* self);
 
     virtual void runTest(bool threaded);
+    WebKit::WebThread* webThread() const { return m_webThread.get(); }
 
     WebCore::CCLayerTreeSettings m_settings;
     OwnPtr<MockCCLayerTreeHostClient> m_client;
     OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
 
 private:
     bool m_beginning;
     bool m_endWhenBeginReturns;
     bool m_timedOut;
     bool m_finished;
@@ skipping 70 matching lines @@
     TEST_F(TEST_FIXTURE_NAME, runSingleThread)            \
     {                                                     \
         runTest(false);                                   \
     }                                                     \
     TEST_F(TEST_FIXTURE_NAME, runMultiThread)             \
     {                                                     \
         runTest(true);                                    \
     }
 
 #endif // CCThreadedTest_h