Fix unreachable code bug caused by anding with zero, per finnur@.

chrome/browser/enumerate_modules_model_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 "chrome/browser/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 #include <algorithm>
 
@@ skipping 877 matching lines @@
     data->SetString("digital_signer", module->digital_signer);
 
     if (!limited_mode_) {
       // Figure out the possible resolution help string.
       base::string16 actions;
       base::string16 separator = base::ASCIIToWide(" ") +
           l10n_util::GetStringUTF16(
               IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPARATOR) +
           base::ASCIIToWide(" ");
 
-      if (module->recommended_action & ModuleEnumerator::NONE) {
+      if (module->recommended_action == ModuleEnumerator::NONE) {

[Finnur, 2014/11/04 17:10:15]

No, you were right. Now that I'm a little fresher in the morning and not as
jet-lagged I realize I gave you the wrong advice. Revert this change and swap
NONE for INVESTIGATING.

         actions = l10n_util::GetStringUTF16(
             IDS_CONFLICTS_CHECK_INVESTIGATING);
       }
       if (module->recommended_action & ModuleEnumerator::UNINSTALL) {
         if (!actions.empty())
           actions += separator;
         actions = l10n_util::GetStringUTF16(
             IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_UNINSTALL);
       }
       if (module->recommended_action & ModuleEnumerator::UPDATE) {
         if (!actions.empty())
           actions += separator;
         actions += l10n_util::GetStringUTF16(
             IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_UPDATE);
       }
       if (module->recommended_action & ModuleEnumerator::DISABLE) {
         if (!actions.empty())
           actions += separator;
         actions += l10n_util::GetStringUTF16(
             IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_DISABLE);
       }

[Finnur, 2014/11/04 17:10:15]

I still think, for bonus points, everything from line 902 to 919 should be
encapsulated in an else-if off of the if statement on line 898 because
INVESTIGATING is what we should show before we figure out what to advice, either
UNINSTALL, UPDATE and/or DISABLE. 

You won't be changing any codepaths by doing so because if you grep for
INVESTIGATING within this file you'll see that it is never (and was never meant
to be) used in conjunction with the other three, only with SEE_LINK, which is
handled separately.

       base::string16 possible_resolution =
           actions.empty() ? base::ASCIIToWide("")
                           : l10n_util::GetStringUTF16(
                                 IDS_CONFLICTS_CHECK_POSSIBLE_ACTIONS) +
           base::ASCIIToWide(" ") +
           actions;
       data->SetString("possibleResolution", possible_resolution);
       data->SetString("help_url",
                       ConstructHelpCenterUrl(*module).spec().c_str());
     }
@@ skipping 106 matching lines @@
   GenerateHash(base::WideToUTF8(module.location), &location);
   GenerateHash(base::WideToUTF8(module.description), &description);
   GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
 
   base::string16 url =
       l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
           base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
           base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
   return GURL(base::UTF16ToUTF8(url));
 }