Allow installer::GetLocalizedString to return mode-specific strings.

chrome/installer/util/firewall_manager_win.cc

 // Copyright 2014 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 "chrome/installer/util/firewall_manager_win.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/installer/util/advanced_firewall_manager_win.h"
 #include "chrome/installer/util/browser_distribution.h"
-#include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/legacy_firewall_manager_win.h"
 
 namespace installer {
 
 namespace {
 
 const uint16_t kDefaultMdnsPort = 5353;
 
@@ skipping 15 matching lines @@
     return manager_.AddUDPRule(GetMdnsRuleName(), GetMdnsRuleDescription(),
                                kDefaultMdnsPort);
   }
 
   void RemoveFirewallRules() override {
     manager_.DeleteAllRules();
   }
 
  private:
   static base::string16 GetMdnsRuleName() {
-#if defined(GOOGLE_CHROME_BUILD)
-    if (InstallUtil::IsChromeSxSProcess())
-      return GetLocalizedString(IDS_INBOUND_MDNS_RULE_NAME_CANARY_BASE);
-#endif
     return GetLocalizedString(IDS_INBOUND_MDNS_RULE_NAME_BASE);
   }
 
   static base::string16 GetMdnsRuleDescription() {
-#if defined(GOOGLE_CHROME_BUILD)
-    if (InstallUtil::IsChromeSxSProcess())
-      return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY_BASE);
-#endif
-      return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_BASE);
+    return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_BASE);
   }
 
   AdvancedFirewallManager manager_;
   DISALLOW_COPY_AND_ASSIGN(FirewallManagerAdvancedImpl);
 };
 
 class FirewallManagerLegacyImpl : public FirewallManager {
  public:
   FirewallManagerLegacyImpl() {}
   ~FirewallManagerLegacyImpl() override {}
@@ skipping 43 matching lines @@
   if (legacy_manager->Init(dist->GetDisplayName(), chrome_path))
     return std::move(legacy_manager);
 
   return nullptr;
 }
 
 FirewallManager::FirewallManager() {
 }
 
 }  // namespace installer