diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 22:01:21 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 22:01:21 +0000 |
| commit | aa341d13fa0ecb358c3f90a1719395c10402b763 (patch) | |
| tree | 21565fbb9954a77130bdc108c1bb95d04734bdb6 /chrome_frame/test | |
| parent | 95484099a0e8b4be4074d6a39b4a4a0eba3f01d6 (diff) | |
| download | chromium_src-aa341d13fa0ecb358c3f90a1719395c10402b763.zip chromium_src-aa341d13fa0ecb358c3f90a1719395c10402b763.tar.gz chromium_src-aa341d13fa0ecb358c3f90a1719395c10402b763.tar.bz2 | |
Add an ATL module to the chrome_frame_net_tests since some of the Chrome accessibility stuff that we pull in depends on having a module.
BUG=Chrome Frame net tests crashed at startup.
TEST=Now they don't.
Review URL: http://codereview.chromium.org/3195001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 9 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 319f17e..64899d8 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -4,6 +4,8 @@ #include "chrome_frame/test/net/fake_external_tab.h" +#include <atlbase.h> +#include <atlcom.h> #include <exdisp.h> #include "app/app_paths.h" @@ -461,6 +463,13 @@ void FilterDisabledTests() { ::testing::FLAGS_gtest_filter = filter; } +// We need a module since some of the accessibility code that gets pulled +// in here uses ATL. +class ObligatoryModule: public CAtlExeModuleT<ObligatoryModule> { +}; + +ObligatoryModule g_obligatory_atl_module; + int main(int argc, char** argv) { WindowWatchdog watchdog; // See url_request_unittest.cc for these credentials. diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index 5238277..b66dfa4 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -42,7 +42,6 @@ class FakeExternalTab { scoped_ptr<BrowserProcess> browser_process_; FilePath overridden_user_dir_; FilePath user_data_dir_; - ScopedOleInitializer ole_initializer_; // For RegisterDropTarget etc to work. scoped_ptr<ProcessSingleton> process_singleton_; }; |