Massive refactoring of extensions sync code

chrome/browser/sync/glue/extension_util_unittest.cc

 // Copyright (c) 2010 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/sync/glue/extension_util.h"
 
 #include "base/file_path.h"
 #include "base/values.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 18 matching lines @@
 const char kValidUpdateUrl1[] =
     "http://clients2.google.com/service/update2/crx";
 const char kValidUpdateUrl2[] =
     "https://clients2.google.com/service/update2/crx";
 const char kName[] = "MyExtension";
 const char kName2[] = "MyExtension2";
 
 class ExtensionUtilTest : public testing::Test {
 };
 
-void MakePossiblySyncableExtension(bool is_theme,
-                                   const GURL& update_url,
-                                   const GURL& launch_url,
-                                   bool converted_from_user_script,
-                                   Extension::Location location,
-                                   int num_plugins,
-                                   Extension* extension) {
+void MakeExtension(bool is_theme, const GURL& update_url,
+                   const GURL& launch_url, bool converted_from_user_script,
+                   Extension::Location location, int num_plugins,
+                   Extension* extension) {
   DictionaryValue source;
   source.SetString(extension_manifest_keys::kName,
                    "PossiblySyncableExtension");
   source.SetString(extension_manifest_keys::kVersion, "0.0.0.0");
   if (is_theme) {
     source.Set(extension_manifest_keys::kTheme, new DictionaryValue());
   }
   if (!update_url.is_empty()) {
     source.SetString(extension_manifest_keys::kUpdateURL,
                      update_url.spec());
@@ skipping 12 matching lines @@
       plugins->Set(i, plugin);
     }
     source.Set(extension_manifest_keys::kPlugins, plugins);
   }
   std::string error;
   EXPECT_TRUE(extension->InitFromValue(source, false, &error));
   EXPECT_EQ("", error);
   extension->set_location(location);
 }
 
-TEST_F(ExtensionUtilTest, IsSyncableExtension) {
+TEST_F(ExtensionUtilTest, GetExtensionType) {
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(), GURL(), false,
-                                  Extension::INTERNAL, 0, &extension);
-    EXPECT_TRUE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(), GURL(), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_EQ(EXTENSION, GetExtensionType(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(kValidUpdateUrl1), GURL(),
-                                  true, Extension::INTERNAL, 0, &extension);
-    EXPECT_TRUE(IsExtensionSyncable(extension));
+    MakeExtension(true, GURL(), GURL(), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_EQ(THEME, GetExtensionType(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(), GURL(), true,
-                                  Extension::INTERNAL, 0, &extension);
-    EXPECT_TRUE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(), GURL(), true,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_EQ(USER_SCRIPT, GetExtensionType(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(true, GURL(), GURL(), false,
-                                  Extension::INTERNAL, 0, &extension);
-    EXPECT_FALSE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(),
+                  GURL("http://www.google.com"), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_EQ(APP, GetExtensionType(extension));
   }
-  // TODO(akalin): Test with a non-empty launch_url once apps are
-  // enabled by default.
+}
+
+TEST_F(ExtensionUtilTest, IsExtensionValid) {
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(), GURL(), false,
-                                  Extension::EXTERNAL_PREF, 0, &extension);
-    EXPECT_FALSE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(), GURL(), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValid(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(
-        false, GURL("http://third-party.update_url.com"), GURL(), true,
-        Extension::INTERNAL, 0, &extension);
-    EXPECT_FALSE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(kValidUpdateUrl1), GURL(),
+                  true, Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValid(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(), GURL(), true,
-                                  Extension::INTERNAL, 1, &extension);
-    EXPECT_FALSE(IsExtensionSyncable(extension));
+    MakeExtension(false, GURL(), GURL(), true,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValid(extension));
   }
   {
     FilePath file_path(kExtensionFilePath);
     Extension extension(file_path);
-    MakePossiblySyncableExtension(false, GURL(), GURL(), true,
-                                  Extension::INTERNAL, 2, &extension);
-    EXPECT_FALSE(IsExtensionSyncable(extension));
+    MakeExtension(true, GURL(), GURL(), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValid(extension));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(),
+                  GURL("http://www.google.com"), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValid(extension));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), false,
+                  Extension::EXTERNAL_PREF, 0, &extension);
+    EXPECT_FALSE(IsExtensionValid(extension));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(
+        false, GURL("http://third-party.update_url.com"), GURL(), true,
+        Extension::INTERNAL, 0, &extension);
+    EXPECT_FALSE(IsExtensionValid(extension));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), true,
+                  Extension::INTERNAL, 1, &extension);
+    EXPECT_FALSE(IsExtensionValid(extension));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), true,
+                  Extension::INTERNAL, 2, &extension);
+    EXPECT_FALSE(IsExtensionValid(extension));
   }
 }
 
+TEST_F(ExtensionUtilTest, IsExtensionValidAndSyncable) {
+  ExtensionTypeSet allowed_extension_types;
+  allowed_extension_types.insert(EXTENSION);
+  allowed_extension_types.insert(APP);
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValidAndSyncable(
+        extension, allowed_extension_types));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(),
+                  GURL("http://www.google.com"), false,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_TRUE(IsExtensionValidAndSyncable(
+        extension, allowed_extension_types));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), true,
+                  Extension::INTERNAL, 0, &extension);
+    EXPECT_FALSE(IsExtensionValidAndSyncable(
+        extension, allowed_extension_types));
+  }
+  {
+    FilePath file_path(kExtensionFilePath);
+    Extension extension(file_path);
+    MakeExtension(false, GURL(), GURL(), false,
+                  Extension::EXTERNAL_PREF, 0, &extension);
+    EXPECT_FALSE(IsExtensionValidAndSyncable(
+        extension, allowed_extension_types));
+  }
+}
+
+
 TEST_F(ExtensionUtilTest, IsExtensionSpecificsUnset) {
   {
     sync_pb::ExtensionSpecifics specifics;
     EXPECT_TRUE(IsExtensionSpecificsUnset(specifics));
   }
 
   {
     sync_pb::ExtensionSpecifics specifics;
     specifics.set_id("a");
     EXPECT_FALSE(IsExtensionSpecificsUnset(specifics));
@@ skipping 316 matching lines @@
   {
     sync_pb::ExtensionSpecifics result = merged_specifics;
     MergeExtensionSpecifics(specifics, true, &result);
     EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics));
   }
 }
 
 }  // namespace
 
 }  // namespace browser_sync