| Index: chrome/browser/extensions/extension_service_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
|
| index 511226edca5b05865ed401402f5eb4ebe3caa312..98ad1b2ac8d10a3f37bb0de98ab9e2260233f212 100644
|
| --- a/chrome/browser/extensions/extension_service_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_service_unittest.cc
|
| @@ -2464,7 +2464,7 @@ 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,
|
| @@ -5606,7 +5606,7 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
|
| 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(
|
| @@ -5619,7 +5619,7 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
|
| 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(
|
| @@ -5632,7 +5632,7 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
|
| 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.
|
| @@ -5646,7 +5646,7 @@ TEST_F(ExtensionServiceTest, ConcurrentExternalLocalFile) {
|
| 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");
|
|
|