Coalesced various extension type enums into Extension::Type.

Renamed Extension::HistogramType to Extension::Type and used it
everywhere.

Moved extension sync security checks into sync land and simplified them.

BUG=55823
TEST=Existing unit tests / sync integration tests

Review URL: http://codereview.chromium.org/5946001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69855 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 79 deletions

diff --git a/chrome/browser/sync/glue/extension_util_unittest.cc b/chrome/browser/sync/glue/extension_util_unittest.cc
index 1a375ff..946ca5a 100644
--- a/chrome/browser/sync/glue/extension_util_unittest.cc
+++ b/chrome/browser/sync/glue/extension_util_unittest.cc
@@ -83,45 +83,6 @@ scoped_refptr<Extension> MakeExtension(
   return extension;
 }
 
-TEST_F(ExtensionUtilTest, GetExtensionType) {
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(), GURL(), false,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_EQ(EXTENSION, GetExtensionType(*extension));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(true, GURL(), GURL(), false,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_EQ(THEME, GetExtensionType(*extension));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(), GURL(), true,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_EQ(LOCAL_USER_SCRIPT, GetExtensionType(*extension));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL("http://www.google.com"), GURL(), true,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_EQ(UPDATEABLE_USER_SCRIPT, GetExtensionType(*extension));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(),
-                      GURL("http://www.google.com"), false,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_EQ(APP, GetExtensionType(*extension));
-  }
-}
-
 TEST_F(ExtensionUtilTest, IsExtensionValid) {
   {
     FilePath file_path(kExtensionFilePath);
@@ -190,46 +151,6 @@ TEST_F(ExtensionUtilTest, IsExtensionValid) {
   }
 }
 
-TEST_F(ExtensionUtilTest, IsExtensionValidAndSyncable) {
-  ExtensionTypeSet allowed_extension_types;
-  allowed_extension_types.insert(EXTENSION);
-  allowed_extension_types.insert(APP);
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(), GURL(), false,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_TRUE(IsExtensionValidAndSyncable(
-        *extension, allowed_extension_types));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(),
-                      GURL("http://www.google.com"), false,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_TRUE(IsExtensionValidAndSyncable(
-        *extension, allowed_extension_types));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(), GURL(), true,
-                      Extension::INTERNAL, 0, file_path));
-    EXPECT_FALSE(IsExtensionValidAndSyncable(
-        *extension, allowed_extension_types));
-  }
-  {
-    FilePath file_path(kExtensionFilePath);
-    scoped_refptr<Extension> extension(
-        MakeExtension(false, GURL(), GURL(), false,
-                      Extension::EXTERNAL_PREF, 0, file_path));
-    EXPECT_FALSE(IsExtensionValidAndSyncable(
-        *extension, allowed_extension_types));
-  }
-}
-
-
 TEST_F(ExtensionUtilTest, IsExtensionSpecificsUnset) {
   {
     sync_pb::ExtensionSpecifics specifics;