diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 03:57:42 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 03:57:42 +0000 |
| commit | 314c3e2d86a4595db7b1ab02b2acd4decf21d65f (patch) | |
| tree | 593431d4dad2fa3c944d8e8f97da3f6fc56140f6 /chrome/browser/extensions/extension_service_unittest.cc | |
| parent | c537090136d23d0064488c27de3bb2ba0f1ac120 (diff) | |
| download | chromium_src-314c3e2d86a4595db7b1ab02b2acd4decf21d65f.zip chromium_src-314c3e2d86a4595db7b1ab02b2acd4decf21d65f.tar.gz chromium_src-314c3e2d86a4595db7b1ab02b2acd4decf21d65f.tar.bz2 | |
Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't used by chrome, so they can be hidden from chrome. The rest were accessed by chrome, but we don't need every embedder to store this data on their ResourceContext implementation. Instead have content associate the data itself to simplify the work for embedders.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9425026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122790 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, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index d18a3202..37187c2 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -60,7 +60,6 @@ #include "chrome/common/string_ordinal.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/public/browser/notification_registrar.h" @@ -404,6 +403,7 @@ ExtensionServiceTestBase::~ExtensionServiceTestBase() { // can be destroyed while BrowserThreads and MessageLoop are still around // (they are used in the destruction process). service_ = NULL; + MessageLoop::current()->RunAllPending(); profile_.reset(NULL); MessageLoop::current()->RunAllPending(); } @@ -4323,6 +4323,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) { TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { InitializeExtensionServiceWithUpdater(); + InitializeRequestContext(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(), &processor); @@ -4380,6 +4381,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) { TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) { InitializeExtensionServiceWithUpdater(); + InitializeRequestContext(); TestSyncProcessorStub processor; service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(), &processor); |