services/ui: Move cc::SoftwareOutputDevice implementation into the client lib.

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 30f787b1c4fc02d1436bd23b404c88f107739aca..b5b6f5a8820eb7eed8cee049a7635b8891c067bb 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -36,7 +36,6 @@ class BrowserTestBase;
 class NestedMessagePumpAndroid;
 class ScopedAllowWaitForAndroidLayoutTests;
 class ScopedAllowWaitForDebugURL;
-class SoftwareOutputDeviceMus;
 class TextInputClientMac;
 class CategorizedWorkerPool;
 }  // namespace content
@@ -228,9 +227,6 @@ 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
-#if !defined(OFFICIAL_BUILD)
-  friend class content::SoftwareOutputDeviceMus;  // Interim non-production code
-#endif
   friend class views::ScreenMus;
 // END USAGE THAT NEEDS TO BE FIXED.