Integrate about:conflicts with --diagnostics...

chrome/browser/enumerate_modules_model_unittest_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef public testing::Test EnumerateModulesTest;
@@ skipping 59 matching lines @@
     EXPECT_STREQ(expected.version.c_str(), test.version.c_str());
     EXPECT_STREQ(expected.digital_signer.c_str(), test.digital_signer.c_str());
     EXPECT_EQ(expected.recommended_action, test.recommended_action);
     EXPECT_TRUE(test.normalized);
   }
 }
 
 const ModuleEnumerator::Module kStandardModule =
   { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0", L"Sig",
     ModuleEnumerator::NONE };
+const ModuleEnumerator::Module kStandardModuleNoDescription =
+  { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"", L"1.0", L"Sig",
+    ModuleEnumerator::NONE };
+const ModuleEnumerator::Module kStandardModuleNoSignature =
+  { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0", L"",
+    ModuleEnumerator::NONE };
 
 // Name, location, description and signature are compared by hashing.
 static const char kMatchName[] = "88e8c9e0";             // "bar.dll".
 static const char kNoMatchName[] = "barfoo.dll";
 static const char kMatchLocation[] = "e6ca7b1c";         // "c:\\foo\\".
 static const char kNoMatchLocation[] = "c:\\foobar\\";
 static const char kMatchDesc[] = "5c4419a6";             // "Desc".
 static const char kNoMatchDesc[] = "NoDesc";
 static const char kVersionHigh[] = "2.0";
 static const char kVersionLow[] = "0.5";
@@ skipping 22 matching lines @@
   }, {  // Matches: Name, not version (location not given) => Not a match.
     ModuleEnumerator::NOT_MATCHED,
     kStandardModule,
     { kMatchName, kEmpty, kEmpty, kVersionHigh, kVersionHigh,
       ModuleEnumerator::SEE_LINK }
   }, {  // Matches: Name, location => Suspected match.
     ModuleEnumerator::SUSPECTED_BAD,
     kStandardModule,
     { kMatchName, kMatchLocation, kEmpty, kEmpty, kEmpty,
       ModuleEnumerator::SEE_LINK }
+  }, {  // Matches: Name, location, (description not given) => Confirmed match.
+    ModuleEnumerator::CONFIRMED_BAD,
+    kStandardModuleNoDescription,  // Note: No description.
+    { kMatchName, kMatchLocation, kEmpty, kEmpty, kEmpty,
+      ModuleEnumerator::SEE_LINK }
+  }, {  // Matches: Name, location, (signature not given) => Confirmed match.
+    ModuleEnumerator::CONFIRMED_BAD,
+    kStandardModuleNoSignature,  // Note: No signature.
+    { kMatchName, kMatchLocation, kEmpty, kEmpty, kEmpty,
+      ModuleEnumerator::SEE_LINK }
   }, {  // Matches: Name, location (not version) => Not a match.
     ModuleEnumerator::NOT_MATCHED,
     kStandardModule,
     { kMatchName, kMatchLocation, kEmpty, kVersionHigh, kVersionLow,
       ModuleEnumerator::SEE_LINK }
   }, {  // Matches: Name, location, signature => Confirmed match.
     ModuleEnumerator::CONFIRMED_BAD,
     kStandardModule,
     { kMatchName, kMatchLocation, kMatchSignature, kEmpty, kEmpty,
       ModuleEnumerator::SEE_LINK }
@@ skipping 81 matching lines @@
     ModuleEnumerator::Module module;
     module.location = kCollapsePathList[i].test_case;
     module_enumerator->CollapsePath(&module);
 
     SCOPED_TRACE("Test case no " + base::IntToString(i) +
                  ": '" + UTF16ToASCII(kCollapsePathList[i].expected_result) +
                  "'");
     EXPECT_EQ(kCollapsePathList[i].expected_result, module.location);
   }
 }