[NOT FOR COMMIT] Hacks to merge render compositor thread with UI thread

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 29 matching lines @@
 namespace chrome_browser_net {
 class Predictor;
 }
 namespace content {
 class BrowserGpuChannelHostFactory;
 class BrowserTestBase;
 class GLHelper;
 class GpuChannelHost;
 class RenderWidgetHelper;
 class TextInputClientMac;
+
+class RenderThreadImpl;
+class CommandBufferProxyImpl;
 }
 namespace dbus {
 class Bus;
 }
 namespace disk_cache {
 class BackendImpl;
 class InFlightIO;
 }
 namespace media {
 class AudioOutputController;
@@ skipping 140 matching lines @@
   friend class disk_cache::BackendImpl;           // http://crbug.com/74623
   friend class disk_cache::InFlightIO;            // http://crbug.com/74623
   friend class media::AudioOutputController;      // http://crbug.com/120973
   friend class net::FileStreamPosix;              // http://crbug.com/115067
   friend class net::FileStreamWin;                // http://crbug.com/115067
   friend class net::internal::AddressTrackerLinux;  // http://crbug.com/125097
   friend class ::AcceleratedPresenter;            // http://crbug.com/125391
   friend class ::BrowserProcessImpl;              // http://crbug.com/125207
   friend class ::MetricsService;                  // http://crbug.com/124954
   friend class ::NativeBackendKWallet;            // http://crbug.com/125331
+
+  friend class content::RenderThreadImpl;
+  friend class content::CommandBufferProxyImpl;
   // END USAGE THAT NEEDS TO BE FIXED.
 
 #if ENABLE_THREAD_RESTRICTIONS
   static bool SetWaitAllowed(bool allowed);
 #else
   static bool SetWaitAllowed(bool allowed) { return true; }
 #endif
 
   // Constructing a ScopedAllowWait temporarily allows waiting on the current
   // thread.  Doing this is almost always incorrect, which is why we limit who
@@ skipping 10 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait);
   };
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions);
 };
 
 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_RESTRICTIONS_H_