Revert of 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 2d78c9bdf8593e74ee019f3664cf15f83da8d8f9..3fda3ac60a1c468f05abcee1b259c7248020d525 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -42,7 +42,6 @@
 class NestedMessagePumpAndroid;
 class ScopedAllowWaitForAndroidLayoutTests;
 class ScopedAllowWaitForDebugURL;
-class SoftwareOutputDeviceMus;
 class TextInputClientMac;
 }  // namespace content
 namespace dbus {
@@ -218,10 +217,7 @@
   friend class net::NetworkChangeNotifierMac;     // http://crbug.com/125097
   friend class ::BrowserProcessImpl;              // http://crbug.com/125207
   friend class ::NativeBackendKWallet;            // http://crbug.com/125331
-#if !defined(OFFICIAL_BUILD)
-  friend class content::SoftwareOutputDeviceMus;  // Interim non-production code
-#endif
-// END USAGE THAT NEEDS TO BE FIXED.
+  // END USAGE THAT NEEDS TO BE FIXED.
 
 #if ENABLE_THREAD_RESTRICTIONS
   static bool SetWaitAllowed(bool allowed);