Revert of media: Add experimental feature to enable Mojo CDM on desktop Chromium

content/browser/service_manager/service_manager_context.cc

 // Copyright 2015 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.
 
 #include "content/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 355 matching lines @@
     unsandboxed_services.insert(
         std::make_pair(content::mojom::kNetworkServiceName,
                        base::ASCIIToUTF16("Network Service")));
   }
   if (base::FeatureList::IsEnabled(video_capture::kMojoVideoCapture)) {
     unsandboxed_services.insert(
         std::make_pair(video_capture::mojom::kServiceName,
                        base::ASCIIToUTF16("Video Capture Service")));
   }
 
-#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
-  // TODO(xhwang): This is only used for test/experiment for now so it's okay
-  // to run it in an unsandboxed utility process. Fix CDM loading so that we can
-  // run it in the sandboxed utility process. See http://crbug.com/510604
-  // TODO(xhwang): Replace the service name "media" with a constant string.
-  unsandboxed_services.insert(
-      std::make_pair("media", base::ASCIIToUTF16("Media Service")));
-#endif
-
   for (const auto& service : unsandboxed_services) {
     packaged_services_connection_->AddServiceRequestHandler(
         service.first, base::Bind(&StartServiceInUtilityProcess, service.first,
                                   service.second, false /* use_sandbox */));
   }
 
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
   packaged_services_connection_->AddServiceRequestHandler(
       "media", base::Bind(&StartServiceInGpuProcess, "media"));
 #endif
@@ skipping 29 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content