Comparison and streaming operators for base::Version

chrome/browser/extensions/extension_service_unittest.cc

 // Copyright (c) 2013 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/extensions/extension_service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <map>
@@ skipping 2445 matching lines @@
   EXPECT_FALSE(service()->pending_extension_manager()->IsIdPending(kGoodId));
 
   const Extension* extension = service()->GetExtensionById(kGoodId, true);
   EXPECT_TRUE(extension);
 }
 
 TEST_F(ExtensionServiceTest, UpdatePendingExtensionWrongVersion) {
   InitializeEmptyExtensionService();
   base::Version other_version("0.1");
   ASSERT_TRUE(other_version.IsValid());
-  ASSERT_FALSE(other_version.Equals(base::Version(kGoodVersion)));
+  ASSERT_NE(other_version, base::Version(kGoodVersion));
   EXPECT_TRUE(
       service()->pending_extension_manager()->AddFromSync(
           kGoodId,
           GURL(kGoodUpdateURL),
           other_version,
           &IsExtension,
           kGoodRemoteInstall,
           kGoodInstalledByCustodian));
   EXPECT_TRUE(service()->pending_extension_manager()->IsIdPending(kGoodId));
 
@@ skipping 3003 matching lines @@
   const Extension* ext = InstallCRX(path, INSTALL_NEW);
   ValidatePrefKeyCount(1u);
   ValidateIntegerPref(good_crx, "state", Extension::ENABLED);
   ValidateIntegerPref(good_crx, "location", Manifest::INTERNAL);
 
   // Now test the logic of OnExternalExtensionFileFound() when the extension
   // being added is already installed.
 
   // Tests assume |older_version| is less than the installed version, and
   // |newer_version| is greater.  Verify this:
-  ASSERT_TRUE(older_version.IsOlderThan(ext->VersionString()));
-  ASSERT_TRUE(ext->version()->IsOlderThan(newer_version.GetString()));
+  ASSERT_LT(older_version, *ext->version());
+  ASSERT_GT(newer_version, *ext->version());
 
   // An external install for the same location should fail if the version is
   // older, or the same, and succeed if the version is newer.
 
   // Older than the installed version...
   EXPECT_FALSE(service()->OnExternalExtensionFileFound(
       kGoodId,
       &older_version,
       kInvalidPathToCrx,
       Manifest::INTERNAL,
@@ skipping 92 matching lines @@
       kGoodId,
       &kVersion123,
       kInvalidPathToCrx,
       Manifest::EXTERNAL_PREF,
       kCreationFlags,
       kDontMarkAcknowledged,
       kDontInstallImmediately));
   const extensions::PendingExtensionInfo* info;
   EXPECT_TRUE((info = pending->GetById(kGoodId)));
   EXPECT_TRUE(info->version().IsValid());
-  EXPECT_TRUE(info->version().Equals(kVersion123));
+  EXPECT_EQ(info->version(), kVersion123);
 
   // Adding a newer version overrides the currently pending version.
   EXPECT_TRUE(service()->OnExternalExtensionFileFound(
       kGoodId,
       &kVersion124,
       kInvalidPathToCrx,
       Manifest::EXTERNAL_PREF,
       kCreationFlags,
       kDontMarkAcknowledged,
       kDontInstallImmediately));
   EXPECT_TRUE((info = pending->GetById(kGoodId)));
   EXPECT_TRUE(info->version().IsValid());
-  EXPECT_TRUE(info->version().Equals(kVersion124));
+  EXPECT_EQ(info->version(), kVersion124);
 
   // Adding an older version fails.
   EXPECT_FALSE(service()->OnExternalExtensionFileFound(
       kGoodId,
       &kVersion123,
       kInvalidPathToCrx,
       Manifest::EXTERNAL_PREF,
       kCreationFlags,
       kDontMarkAcknowledged,
       kDontInstallImmediately));
   EXPECT_TRUE((info = pending->GetById(kGoodId)));
   EXPECT_TRUE(info->version().IsValid());
-  EXPECT_TRUE(info->version().Equals(kVersion124));
+  EXPECT_EQ(info->version(), kVersion124);
 
   // Adding an older version fails even when coming from a higher-priority
   // location.
   EXPECT_FALSE(service()->OnExternalExtensionFileFound(
       kGoodId,
       &kVersion123,
       kInvalidPathToCrx,
       Manifest::EXTERNAL_REGISTRY,
       kCreationFlags,
       kDontMarkAcknowledged,
       kDontInstallImmediately));
   EXPECT_TRUE((info = pending->GetById(kGoodId)));
   EXPECT_TRUE(info->version().IsValid());
-  EXPECT_TRUE(info->version().Equals(kVersion124));
+  EXPECT_EQ(info->version(), kVersion124);
 
   // Adding the latest version from the webstore overrides a specific version.
   GURL kUpdateUrl("http://example.com/update");
   EXPECT_TRUE(service()->OnExternalExtensionUpdateUrlFound(
       kGoodId,
       std::string(),
       kUpdateUrl,
       Manifest::EXTERNAL_POLICY_DOWNLOAD,
       Extension::NO_FLAGS,
       false));
@@ skipping 607 matching lines @@
 
   service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
                      content::Source<Profile>(profile()),
                      content::NotificationService::NoDetails());
   EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
   EXPECT_EQ(0u, registry()->enabled_extensions().size());
   EXPECT_EQ(0u, registry()->disabled_extensions().size());
   EXPECT_EQ(0u, registry()->terminated_extensions().size());
   EXPECT_EQ(0u, registry()->blacklisted_extensions().size());
 }