p1 mus+ash chrome renders ui and content

base/threading/thread_restrictions.h

Index: base/threading/thread_restrictions.h
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 3fda3ac60a1c468f05abcee1b259c7248020d525..de361f9a666a01387b9ade4b37cf33d9a100f297 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -42,6 +42,7 @@ class GpuChannelHost;
 class NestedMessagePumpAndroid;
 class ScopedAllowWaitForAndroidLayoutTests;
 class ScopedAllowWaitForDebugURL;
+class SoftwareOutputDeviceMus;
 class TextInputClientMac;
 }  // namespace content
 namespace dbus {
@@ -217,7 +218,10 @@ class BASE_EXPORT ThreadRestrictions {
   friend class net::NetworkChangeNotifierMac;     // http://crbug.com/125097
   friend class ::BrowserProcessImpl;              // http://crbug.com/125207
   friend class ::NativeBackendKWallet;            // http://crbug.com/125331
-  // END USAGE THAT NEEDS TO BE FIXED.
+#if !defined(OFFICIAL_BUILD)
+  friend class content::SoftwareOutputDeviceMus;  // http://crbug.com/548451

[jam, 2015/11/13 17:17:55]

nit: add a comment saying that this is not production code. no need to put a bug
there (that's usually tracking removal of this entry, which doesn't really apply
here)

[rjkroege, 2015/11/13 23:00:11]

Done.

+#endif
+// END USAGE THAT NEEDS TO BE FIXED.
 
 #if ENABLE_THREAD_RESTRICTIONS
   static bool SetWaitAllowed(bool allowed);