diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:29:01 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:29:01 +0000 |
| commit | 55b4ce7b3ca06624bd645bf9625b909827d2f3ba (patch) | |
| tree | d5f98a669049f2692229c906cb1d588c5c6806a1 /chrome_frame/test/net | |
| parent | 6bb2d378c1055e87cc53b4bef1de9ce14fd1a6a8 (diff) | |
| download | chromium_src-55b4ce7b3ca06624bd645bf9625b909827d2f3ba.zip chromium_src-55b4ce7b3ca06624bd645bf9625b909827d2f3ba.tar.gz chromium_src-55b4ce7b3ca06624bd645bf9625b909827d2f3ba.tar.bz2 | |
Wire up Chrome's resources to the CF net tests' ResourceBundle.
The resources aren't compiled into chrome_frame_net_tests.exe, so read them out of chrome.dll (which has already been loaded, how convenient!).
BUG=144649
TEST=chrome_frame_net_tests runs in debug builds again
Review URL: https://chromiumcodereview.appspot.com/10911284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index a21933b..74dd42a 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -68,6 +68,7 @@ #include "sandbox/win/src/sandbox_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/resource/resource_bundle_win.h" #include "ui/base/ui_base_paths.h" using content::BrowserThread; @@ -465,6 +466,9 @@ void FakeExternalTab::Initialize() { DCHECK(res_mod); _AtlBaseModule.SetResourceInstance(res_mod); + // Point the ResourceBundle at chrome.dll. + ui::SetResourcesDataDLL(_AtlBaseModule.GetResourceInstance()); + ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); CommandLine* cmd = CommandLine::ForCurrentProcess(); |