diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 21:57:53 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 21:57:53 +0000 |
| commit | 4361c7ca9c1a850f3c075612bd0e20630b821355 (patch) | |
| tree | 98b7e5e2f1a4923a4d2df5d97620d8abfd29d4a5 /chrome/test | |
| parent | 9fabbf77b5b467003287b055aece906a4330de86 (diff) | |
| download | chromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.zip chromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.tar.gz chromium_src-4361c7ca9c1a850f3c075612bd0e20630b821355.tar.bz2 | |
Refactor ChromeURLRequestContext to pull out ExtensionInfoMap into a shared
data structure that all the different contexts have a handle to.
BUG=56558
TEST=no functional change
Review URL: http://codereview.chromium.org/3439017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
6 files changed, 14 insertions, 11 deletions
diff --git a/chrome/test/data/extensions/effective_host_permissions/duplicate_content_script.json b/chrome/test/data/extensions/effective_host_permissions/duplicate_content_script.json index 584bb59..3da0e9f 100644 --- a/chrome/test/data/extensions/effective_host_permissions/duplicate_content_script.json +++ b/chrome/test/data/extensions/effective_host_permissions/duplicate_content_script.json @@ -3,8 +3,8 @@ "version": "1.0", "permissions": [ "http://*.google.com/", - "http://google.com", - "https://google.com" + "http://google.com/", + "https://google.com/" ], "content_scripts": [ { diff --git a/chrome/test/data/extensions/effective_host_permissions/duplicate_host.json b/chrome/test/data/extensions/effective_host_permissions/duplicate_host.json index c4ea798..1be3912 100644 --- a/chrome/test/data/extensions/effective_host_permissions/duplicate_host.json +++ b/chrome/test/data/extensions/effective_host_permissions/duplicate_host.json @@ -3,6 +3,6 @@ "version": "1.0", "permissions": [ "http://*.google.com/", - "http://google.com" + "http://google.com/" ] } diff --git a/chrome/test/data/extensions/effective_host_permissions/https_not_considered.json b/chrome/test/data/extensions/effective_host_permissions/https_not_considered.json index 1b3e123..84a414b 100644 --- a/chrome/test/data/extensions/effective_host_permissions/https_not_considered.json +++ b/chrome/test/data/extensions/effective_host_permissions/https_not_considered.json @@ -3,7 +3,7 @@ "version": "1.0", "permissions": [ "http://*.google.com/", - "http://google.com", - "https://google.com" + "http://google.com/", + "https://google.com/" ] } diff --git a/chrome/test/data/extensions/effective_host_permissions/two_content_scripts.json b/chrome/test/data/extensions/effective_host_permissions/two_content_scripts.json index 2f7c3df..4c5d4af 100644 --- a/chrome/test/data/extensions/effective_host_permissions/two_content_scripts.json +++ b/chrome/test/data/extensions/effective_host_permissions/two_content_scripts.json @@ -3,8 +3,8 @@ "version": "1.0", "permissions": [ "http://*.google.com/", - "http://google.com", - "https://google.com" + "http://google.com/", + "https://google.com/" ], "content_scripts": [ { diff --git a/chrome/test/data/extensions/manifest_tests/tabs_extension.json b/chrome/test/data/extensions/manifest_tests/tabs_extension.json new file mode 100644 index 0000000..252b41e --- /dev/null +++ b/chrome/test/data/extensions/manifest_tests/tabs_extension.json @@ -0,0 +1,5 @@ +{ + "name": "test", + "version": "0.1", + "permissions": ["tabs"] +} diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index b1e466d..d84079f 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -269,10 +269,8 @@ class TestingProfile : public Profile { virtual ProfileSyncService* GetProfileSyncService( const std::string& cros_notes); virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; } - - virtual ChromeBlobStorageContext* GetBlobStorageContext() { - return NULL; - } + virtual ChromeBlobStorageContext* GetBlobStorageContext() { return NULL; } + virtual ExtensionInfoMap* GetExtensionInfoMap() { return NULL; } protected: base::Time start_time_; |