[Sync] Rip out overly-complicated ExtensionData class

chrome/browser/sync/glue/extension_util_unittest.cc

Index: chrome/browser/sync/glue/extension_util_unittest.cc
diff --git a/chrome/browser/sync/glue/extension_util_unittest.cc b/chrome/browser/sync/glue/extension_util_unittest.cc
index e7494c4a1b44a0806c76d9d0a266590242331d3d..261f2f71c1699d4504a187c528b47c3b1cbda85c 100644
--- a/chrome/browser/sync/glue/extension_util_unittest.cc
+++ b/chrome/browser/sync/glue/extension_util_unittest.cc
@@ -153,290 +153,6 @@ TEST_F(ExtensionUtilTest, IsExtensionValid) {
   }
 }
 
-TEST_F(ExtensionUtilTest, IsExtensionSpecificsUnset) {
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    EXPECT_TRUE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_id("a");
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_version("a");
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_update_url("a");
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_enabled(true);
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_incognito_enabled(true);
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics;
-    specifics.set_name("a");
-    EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  }
-}
-
-TEST_F(ExtensionUtilTest, IsExtensionSpecificsValid) {
-  sync_pb::ExtensionSpecifics specifics;
-  EXPECT_FALSE(IsExtensionSpecificsValid(specifics));
-  specifics.set_id(kValidId);
-  EXPECT_FALSE(IsExtensionSpecificsValid(specifics));
-  specifics.set_version(kValidVersion);
-  EXPECT_TRUE(IsExtensionSpecificsValid(specifics));
-  EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-  specifics.set_update_url(kValidUpdateUrl1);
-  EXPECT_TRUE(IsExtensionSpecificsValid(specifics));
-  EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
-
-  {
-    sync_pb::ExtensionSpecifics specifics_copy(specifics);
-    specifics_copy.set_id("invalid");
-    EXPECT_FALSE(IsExtensionSpecificsValid(specifics_copy));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics_copy(specifics);
-    specifics_copy.set_version("invalid");
-    EXPECT_FALSE(IsExtensionSpecificsValid(specifics_copy));
-  }
-
-  {
-    sync_pb::ExtensionSpecifics specifics_copy(specifics);
-    specifics_copy.set_update_url("http:invalid.com:invalid");
-    EXPECT_FALSE(IsExtensionSpecificsValid(specifics_copy));
-  }
-}
-
-TEST_F(ExtensionUtilTest, AreExtensionSpecificsEqual) {
-  sync_pb::ExtensionSpecifics a, b;
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_id("a");
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_id("a");
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_version("1.5");
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_version("1.5");
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_update_url("http://www.foo.com");
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_update_url("http://www.foo.com");
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_enabled(true);
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_enabled(true);
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_incognito_enabled(true);
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_incognito_enabled(true);
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-
-  a.set_name("name");
-  EXPECT_FALSE(AreExtensionSpecificsEqual(a, b));
-  b.set_name("name");
-  EXPECT_TRUE(AreExtensionSpecificsEqual(a, b));
-}
-
-TEST_F(ExtensionUtilTest, CopyUserProperties) {
-  sync_pb::ExtensionSpecifics dest_specifics;
-  dest_specifics.set_version(kVersion2);
-  dest_specifics.set_update_url(kValidUpdateUrl1);
-  dest_specifics.set_enabled(true);
-  dest_specifics.set_incognito_enabled(false);
-  dest_specifics.set_name(kName);
-
-  sync_pb::ExtensionSpecifics specifics;
-  specifics.set_id(kValidId);
-  specifics.set_version(kVersion3);
-  specifics.set_update_url(kValidUpdateUrl2);
-  specifics.set_enabled(false);
-  specifics.set_incognito_enabled(true);
-  specifics.set_name(kName2);
-
-  CopyUserProperties(specifics, &dest_specifics);
-  EXPECT_EQ("", dest_specifics.id());
-  EXPECT_EQ(kVersion2, dest_specifics.version());
-  EXPECT_EQ(kValidUpdateUrl1, dest_specifics.update_url());
-  EXPECT_FALSE(dest_specifics.enabled());
-  EXPECT_TRUE(dest_specifics.incognito_enabled());
-  EXPECT_EQ(kName, dest_specifics.name());
-}
-
-TEST_F(ExtensionUtilTest, CopyNonUserProperties) {
-  sync_pb::ExtensionSpecifics dest_specifics;
-  dest_specifics.set_id(kValidId);
-  dest_specifics.set_version(kVersion2);
-  dest_specifics.set_update_url(kValidUpdateUrl1);
-  dest_specifics.set_enabled(true);
-  dest_specifics.set_incognito_enabled(false);
-  dest_specifics.set_name(kName);
-
-  sync_pb::ExtensionSpecifics specifics;
-  specifics.set_id("");
-  specifics.set_version(kVersion3);
-  specifics.set_update_url(kValidUpdateUrl2);
-  specifics.set_enabled(false);
-  specifics.set_incognito_enabled(true);
-  specifics.set_name(kName2);
-
-  CopyNonUserProperties(specifics, &dest_specifics);
-  EXPECT_EQ("", dest_specifics.id());
-  EXPECT_EQ(kVersion3, dest_specifics.version());
-  EXPECT_EQ(kValidUpdateUrl2, dest_specifics.update_url());
-  EXPECT_TRUE(dest_specifics.enabled());
-  EXPECT_FALSE(dest_specifics.incognito_enabled());
-  EXPECT_EQ(kName2, dest_specifics.name());
-}
-
-TEST_F(ExtensionUtilTest, AreExtensionSpecificsUserPropertiesEqual) {
-  sync_pb::ExtensionSpecifics a, b;
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_id("a");
-  b.set_id("b");
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_version("1.5");
-  b.set_version("1.6");
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_name("name");
-  b.set_name("name2");
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_update_url("http://www.foo.com");
-  b.set_update_url("http://www.foo2.com");
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_enabled(true);
-  EXPECT_FALSE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-  b.set_enabled(true);
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-
-  a.set_incognito_enabled(true);
-  EXPECT_FALSE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-  b.set_incognito_enabled(true);
-  EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(a, b));
-}
-
-TEST_F(ExtensionUtilTest, AreExtensionSpecificsNonUserPropertiesEqual) {
-  sync_pb::ExtensionSpecifics a, b;
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_enabled(true);
-  b.set_enabled(false);
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_incognito_enabled(true);
-  b.set_incognito_enabled(false);
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_id("a");
-  EXPECT_FALSE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-  b.set_id("a");
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_version("1.5");
-  EXPECT_FALSE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-  b.set_version("1.5");
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_update_url("http://www.foo.com");
-  EXPECT_FALSE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-  b.set_update_url("http://www.foo.com");
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-
-  a.set_name("name");
-  EXPECT_FALSE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-  b.set_name("name");
-  EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(a, b));
-}
-
-TEST_F(ExtensionUtilTest, MergeExtensionSpecificsWithUserProperties) {
-  sync_pb::ExtensionSpecifics merged_specifics;
-  merged_specifics.set_id(kValidId);
-  merged_specifics.set_update_url(kValidUpdateUrl1);
-  merged_specifics.set_enabled(true);
-  merged_specifics.set_incognito_enabled(false);
-  merged_specifics.set_version(kVersion2);
-
-  sync_pb::ExtensionSpecifics specifics;
-  specifics.set_id(kValidId);
-  specifics.set_update_url(kValidUpdateUrl2);
-  merged_specifics.set_enabled(false);
-  merged_specifics.set_incognito_enabled(true);
-
-  specifics.set_version(kVersion1);
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, false, &result);
-    EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(
-        result, merged_specifics));
-    EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(
-        result, merged_specifics));
-  }
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, true, &result);
-    EXPECT_TRUE(AreExtensionSpecificsEqual(result, merged_specifics));
-  }
-
-  specifics.set_version(kVersion2);
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, false, &result);
-    EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(
-        result, merged_specifics));
-    EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(
-        result, specifics));
-  }
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, true, &result);
-    EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics));
-  }
-
-  specifics.set_version(kVersion3);
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, false, &result);
-    EXPECT_TRUE(AreExtensionSpecificsUserPropertiesEqual(
-        result, merged_specifics));
-    EXPECT_TRUE(AreExtensionSpecificsNonUserPropertiesEqual(
-        result, specifics));
-  }
-  {
-    sync_pb::ExtensionSpecifics result = merged_specifics;
-    MergeExtensionSpecifics(specifics, true, &result);
-    EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics));
-  }
-}
-
 TEST_F(ExtensionUtilTest, SpecificsToSyncData) {
   sync_pb::ExtensionSpecifics specifics;
   specifics.set_id(kValidId);