Remove base/win/metro.{cc|h} and some associated code

chrome/app/main_dll_loader_win.cc

 // Copyright (c) 2012 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 <windows.h>  // NOLINT
 #include <shlwapi.h>  // NOLINT
 #include <stddef.h>
 #include <userenv.h>  // NOLINT
 
 #include "chrome/app/main_dll_loader_win.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
-#include "base/win/metro.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_crash_reporter_client.h"
 #include "chrome/app/chrome_watcher_client_win.h"
 #include "chrome/app/chrome_watcher_command_line_win.h"
 #include "chrome/app/file_pre_reader_win.h"
 #include "chrome/app/kasko_client.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 119 matching lines @@
   return profile_type;
 }
 
 #endif  // BUILDFLAG(ENABLE_KASKO)
 
 }  // namespace
 
 //=============================================================================
 
 MainDllLoader::MainDllLoader()
-    : dll_(nullptr), metro_mode_(base::win::IsMetroProcess()) {
+    : dll_(nullptr) {
 }
 
 MainDllLoader::~MainDllLoader() {
 }
 
 // Loading chrome is an interesting affair. First we try loading from the
 // current directory to support run-what-you-compile and other development
 // scenarios.
 // If that fails then we look at the version resource in the current
 // module. This is the expected path for chrome.exe browser instances in an
 // installed build.
 HMODULE MainDllLoader::Load(base::string16* version, base::FilePath* module) {
   const base::char16* dll_name = nullptr;
-  if (metro_mode_) {
-    dll_name = installer::kChromeMetroDll;
-  } else if (process_type_ == "service" || process_type_.empty()) {
+  if (process_type_ == "service" || process_type_.empty()) {
     dll_name = installer::kChromeDll;
   } else if (process_type_ == "watcher") {
     dll_name = kChromeWatcherDll;
   } else {
 #if defined(CHROME_MULTIPLE_DLL)
     dll_name = installer::kChromeChildDll;
 #else
     dll_name = installer::kChromeDll;
 #endif
   }
 
   *module = installer::GetModulePath(dll_name, version);
   if (module->empty()) {
     PLOG(ERROR) << "Cannot find module " << dll_name;
     return nullptr;
   }
-  const bool pre_read = !metro_mode_;
-  HMODULE dll = LoadModuleWithDirectory(*module, pre_read);
+  HMODULE dll = LoadModuleWithDirectory(*module, true);

[sky, 2016/01/12 03:40:51]

Looks like this is the only caller of LoadModuleWithDirectory. Nuke the second
param.

[scottmg, 2016/01/12 18:24:16]

Done.

   if (!dll) {
     PLOG(ERROR) << "Failed to load Chrome DLL from " << module->value();
     return nullptr;
   }
 
   DCHECK(dll);
   return dll;
 }
 
 // Launching is a matter of loading the right dll, setting the CHROME_VERSION
 // environment variable and just calling the entry point. Derived classes can
 // add custom code in the OnBeforeLaunch callback.
 int MainDllLoader::Launch(HINSTANCE instance) {
   const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
   process_type_ = cmd_line.GetSwitchValueASCII(switches::kProcessType);
 
   base::string16 version;
   base::FilePath file;
 
-  if (metro_mode_) {
-    HMODULE metro_dll = Load(&version, &file);
-    if (!metro_dll)
-      return chrome::RESULT_CODE_MISSING_DATA;
-
-    InitMetro chrome_metro_main =
-        reinterpret_cast<InitMetro>(::GetProcAddress(metro_dll, "InitMetro"));
-    return chrome_metro_main();
-  }
-
   if (process_type_ == "watcher") {
     chrome::RegisterPathProvider();
 
     base::win::ScopedHandle parent_process;
     base::win::ScopedHandle on_initialized_event;
     DWORD main_thread_id = 0;
     if (!InterpretChromeWatcherCommandLine(cmd_line, &parent_process,
                                            &main_thread_id,
                                            &on_initialized_event)) {
       return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
@@ skipping 161 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }