diff options
| author | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 20:36:16 +0000 |
|---|---|---|
| committer | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 20:36:16 +0000 |
| commit | 2dd966a882a4d07d0c1f060bb0f6ebdff79bb488 (patch) | |
| tree | 9f2611c6bfc20f8da4cc6f21066af36c725de176 /chrome_frame | |
| parent | 84e3fb157b11f35bae34de7a9d152293f4dd95d5 (diff) | |
| download | chromium_src-2dd966a882a4d07d0c1f060bb0f6ebdff79bb488.zip chromium_src-2dd966a882a4d07d0c1f060bb0f6ebdff79bb488.tar.gz chromium_src-2dd966a882a4d07d0c1f060bb0f6ebdff79bb488.tar.bz2 | |
Remove second layer of lazy loading from base_feature_provider.
LazyFeatureProvider is not thread safe and can cause crashes.
This CL removes LazyFeatureProvider altogether.
BUG=313743
Review URL: https://codereview.chromium.org/57863004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index d28c3cf..b38e8c9 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -529,6 +529,11 @@ void FakeExternalTab::Initialize() { ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); + base::FilePath resources_pack_path; + PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); + ResourceBundle::GetSharedInstance().AddDataPackFromPath( + resources_pack_path, ui::SCALE_FACTOR_NONE); + CommandLine* cmd = CommandLine::ForCurrentProcess(); // Disable Device Discovery with switch because this test does not respect // BrowserContextKeyedBaseFactory::ServiceIsNULLWhileTesting. |