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

chrome/installer/util/shell_util.cc

Index: chrome/installer/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 6051eba27ab6845612c5c676faf0c3c67d209d0e..324ed4ff48590f65862e289695c3111e750946cc 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -36,7 +36,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/values.h"
-#include "base/win/metro.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
@@ -300,10 +299,7 @@ void GetProgIdEntries(const ApplicationInfo& app_info,
     entries->push_back(new RegistryEntry(
         prog_id_path + ShellUtil::kRegShellOpen, ShellUtil::kRegDelegateExecute,
         app_info.delegate_clsid));
-    // If Metro is not supported, remove the DelegateExecute entry instead of
-    // adding it.
-    if (!base::win::IsChromeMetroSupported())
-      entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);
+    entries->back()->set_removal_flag(RegistryEntry::RemovalFlag::VALUE);

[gab, 2016/01/12 21:11:04]

This code could be simplified. Only reason to introduce RemovalFlag in the first
place was that this could not simply be removal code but had to be inlined with
insertion code.

It could now simply be unconditional cleanup code and we could get rid of
RemovalFlag which was introduced for this specific use case.

Please add TODOs here as this code looks very weird as such without legacy Metro
context.

[scottmg, 2016/01/13 20:48:16]

Done. I don't fully understand the code, or when it's used, so just added the
TODO for now.

   }
 
   // The following entries are required as of Windows 8, but do not
@@ -381,12 +377,10 @@ void GetChromeProgIdEntries(BrowserDistribution* dist,
   if (!app_info.delegate_clsid.empty()) {
     ScopedVector<RegistryEntry> delegate_execute_entries =
         GetChromeDelegateExecuteEntries(chrome_exe, app_info);
-    if (!base::win::IsChromeMetroSupported()) {
-      // Remove the keys (not only their values) so that Windows will continue
-      // to launch Chrome without a pesky association error.
-      for (RegistryEntry* entry : delegate_execute_entries)
-        entry->set_removal_flag(RegistryEntry::RemovalFlag::KEY);
-    }
+    // Remove the keys (not only their values) so that Windows will continue

[gab, 2016/01/12 21:11:04]

Ditto here: add TODO

[scottmg, 2016/01/13 20:48:16]

Done.

+    // to launch Chrome without a pesky association error.
+    for (RegistryEntry* entry : delegate_execute_entries)
+      entry->set_removal_flag(RegistryEntry::RemovalFlag::KEY);
     // Move |delegate_execute_entries| to |entries|.
     entries->insert(entries->end(), delegate_execute_entries.begin(),
                     delegate_execute_entries.end());