Use a static catalog manifest for the standalone Mash runner

services/service_manager/runner/host/service_process_launcher.cc

 // Copyright 2016 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 "services/service_manager/runner/host/service_process_launcher.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "services/service_manager/public/cpp/standalone_service/mach_broker.h"
 #endif
 
-#if defined(OS_WIN) && defined(COMPONENT_BUILD)
-#include <windows.h>
-
-namespace {
-
-class ScopedDllDirectoryOverride {
- public:
-  explicit ScopedDllDirectoryOverride(const base::FilePath& path) {
-    SetDllDirectory(path.value().c_str());
-  }
-
-  ~ScopedDllDirectoryOverride() {
-    SetDllDirectory(NULL);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScopedDllDirectoryOverride);
-};
-
-}  // namespace
-#endif  // defined(OS_WIN) && defined(COMPONENT_BUILD)
-
 namespace service_manager {
 
 ServiceProcessLauncher::ServiceProcessLauncher(
     base::TaskRunner* launch_process_runner,
     Delegate* delegate,
     const base::FilePath& service_path)
     : launch_process_runner_(launch_process_runner),
       delegate_(delegate),
       start_sandboxed_(false),
       service_path_(service_path),
@@ skipping 143 matching lines @@
     if (!child_process_.IsValid()) {
       LOG(ERROR) << "Starting the process with a sandbox failed. Missing kernel"
                  << " support.";
     }
   } else
 #endif
   {
 #if defined(OS_MACOSX)
     MachBroker* mach_broker = MachBroker::GetInstance();
     base::AutoLock locker(mach_broker->GetLock());
-#elif defined(OS_WIN) && defined(COMPONENT_BUILD)
-    ScopedDllDirectoryOverride dll_override(exe_dir);
 #endif
     child_process_ = base::LaunchProcess(*child_command_line, options);
 #if defined(OS_MACOSX)
     mach_broker->ExpectPid(child_process_.Handle());
 #endif
   }
 
   if (child_process_.IsValid()) {
     DVLOG(0) << "Launched child process pid=" << child_process_.Pid()
              << ", instance=" << target_.instance()
              << ", name=" << target_.name()
              << ", user_id=" << target_.user_id();
 
     if (mojo_ipc_channel_.get()) {
       mojo_ipc_channel_->ChildProcessLaunched();
       mojo::edk::ChildProcessLaunched(
           child_process_.Handle(),
           mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
               mojo_ipc_channel_->PassServerHandle().release().handle)),
           child_token_);
     }
   }
   start_child_process_event_.Signal();
 }
 
 }  // namespace service_manager