diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 03:26:57 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 03:26:57 +0000 |
| commit | 289c44bbf904e0339b8e4b0d8ed5456593a135e5 (patch) | |
| tree | 2fae601f2a44ade6701c4e1a233e734579606f59 /chrome/browser/extensions/extension_service_unittest.cc | |
| parent | 3184a8e64ddcf24c694e8bd57dad40d4011991f1 (diff) | |
| download | chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.zip chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.tar.gz chromium_src-289c44bbf904e0339b8e4b0d8ed5456593a135e5.tar.bz2 | |
Move c/c/e/extension_set to top-level extensions/
Move extension_set.h/cc and extension_set_unittest to extensions/common/.
Remove unused includes.
Add includes where transitive includes were used.
Update DEPS.
No functional changes.
BUG=162530
TBR=sky@chromium.org (c/b/autocomplete, c/b/ui, c/test)
TBR=jam@chromium.org (c/b/automation)
TBR=atwilson@chromium.org (c/b/background, c/b/sync, c/b/policy)
TBR=bauerb@chromium.org (c/b/browsing_data, c/b/content_settings, c/b/managed_mode)
TBR=satorux@chromium.org (c/b/chromeos)
TBR=yurys@chromium.org (c/b/devtools)
TBR=thestig@chromium.org (c/b/media_galleries)
TBR=stevenjb@chromium.org (c/b/notifications)
TBR=battre@chromium.org (c/b/profile_resetter)
TBR=dmazzoni@chromium.org (c/b/speech)
TBR=kinuko@chromium.org (c/b/sync_file_system)
TBR=pkotwicz@chromium.org (c/b/themes)
Review URL: https://codereview.chromium.org/102103005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_service_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index a0b3c69..4601480 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -3369,8 +3369,8 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) { InitializeGoodInstalledExtensionService(); service_->Init(); - const ExtensionSet* extensions = service_->extensions(); - const ExtensionSet* blacklisted_extensions = + const extensions::ExtensionSet* extensions = service_->extensions(); + const extensions::ExtensionSet* blacklisted_extensions = service_->blacklisted_extensions(); EXPECT_TRUE( extensions->Contains(good0) && |