Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and i...

chrome/common/extensions/extension_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/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 #include "app/l10n_util.h"
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/codec/png_codec.h"
 #include "net/base/mime_sniffer.h"
 #include "skia/ext/image_operations.h"
-#include "chrome/test/ui_test_utils.h"
-#include "net/base/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 namespace errors = extension_manifest_errors;
 
 class ExtensionTest : public testing::Test {
 };
 
 // We persist location values in the preferences, so this is a sanity test that
@@ skipping 684 matching lines @@
   std::string error;
   scoped_ptr<Extension> extension(new Extension(path.DirName()));
   extension->InitFromValue(*static_cast<DictionaryValue*>(result.get()),
                            false, &error);
 
   return extension.release();
 }
 
 TEST(ExtensionTest, EffectiveHostPermissions) {
   scoped_ptr<Extension> extension;
-  ExtensionExtent hosts;
+  std::set<std::string> hosts;
 
   extension.reset(LoadManifest("effective_host_permissions", "empty.json"));
-  EXPECT_EQ(0u, extension->GetEffectiveHostPermissions().patterns().size());
+  EXPECT_EQ(0u, extension->GetEffectiveHostPermissions().size());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions", "one_host.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(1u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.google.com")));
+  EXPECT_EQ(1u, hosts.size());
+  EXPECT_TRUE(hosts.find("www.google.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "one_host_wildcard.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(1u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://google.com")));
+  EXPECT_EQ(1u, hosts.size());
+  EXPECT_TRUE(hosts.find("google.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "two_hosts.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(2u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.google.com")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.reddit.com")));
+  EXPECT_EQ(2u, hosts.size());
+  EXPECT_TRUE(hosts.find("www.google.com") != hosts.end());
+  EXPECT_TRUE(hosts.find("www.reddit.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "duplicate_host.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(1u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://google.com")));
+  EXPECT_EQ(1u, hosts.size());
+  EXPECT_TRUE(hosts.find("google.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "https_not_considered.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(1u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://google.com")));
+  EXPECT_EQ(1u, hosts.size());
+  EXPECT_TRUE(hosts.find("google.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "two_content_scripts.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(3u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://google.com")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.reddit.com")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://news.ycombinator.com")));
+  EXPECT_EQ(3u, hosts.size());
+  EXPECT_TRUE(hosts.find("google.com") != hosts.end());
+  EXPECT_TRUE(hosts.find("www.reddit.com") != hosts.end());
+  EXPECT_TRUE(hosts.find("news.ycombinator.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "duplicate_content_script.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(3u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://google.com")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.reddit.com")));
+  EXPECT_EQ(2u, hosts.size());
+  EXPECT_TRUE(hosts.find("google.com") != hosts.end());
+  EXPECT_TRUE(hosts.find("www.reddit.com") != hosts.end());
   EXPECT_FALSE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "all_hosts.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(1u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://test/")));
+  EXPECT_EQ(1u, hosts.size());
+  EXPECT_TRUE(hosts.find("") != hosts.end());
   EXPECT_TRUE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "all_hosts2.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(2u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://test/")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.google.com")));
+  EXPECT_EQ(2u, hosts.size());
+  EXPECT_TRUE(hosts.find("") != hosts.end());
+  EXPECT_TRUE(hosts.find("www.google.com") != hosts.end());
   EXPECT_TRUE(extension->HasAccessToAllHosts());
 
   extension.reset(LoadManifest("effective_host_permissions",
                                "all_hosts3.json"));
   hosts = extension->GetEffectiveHostPermissions();
-  EXPECT_EQ(2u, hosts.patterns().size());
-  EXPECT_TRUE(hosts.ContainsURL(GURL("https://test/")));
-  EXPECT_TRUE(hosts.ContainsURL(GURL("http://www.google.com")));
+  EXPECT_EQ(2u, hosts.size());
+  EXPECT_TRUE(hosts.find("") != hosts.end());
+  EXPECT_TRUE(hosts.find("www.google.com") != hosts.end());
   EXPECT_TRUE(extension->HasAccessToAllHosts());
 }
 
 TEST(ExtensionTest, IsPrivilegeIncrease) {
   const struct {
     const char* base_name;
     bool expect_success;
   } kTests[] = {
     { "allhosts1", false },  // all -> all
     { "allhosts2", false },  // all -> one
@@ skipping 103 matching lines @@
   extension->SetCachedImage(resource, image, original_size);
   EXPECT_TRUE(extension->HasCachedImage(resource, original_size));
   EXPECT_TRUE(extension->HasCachedImage(resource, size128));
   EXPECT_TRUE(SizeEquals(extension->GetCachedImage(resource, original_size),
                          original_size));
   EXPECT_TRUE(SizeEquals(extension->GetCachedImage(resource, size128),
                          original_size));
   EXPECT_EQ(extension->GetCachedImage(resource, original_size).getPixels(),
             extension->GetCachedImage(resource, size128).getPixels());
 }