Chromium Code Reviews| Index: chrome_frame/test/net/fake_external_tab.cc |
| =================================================================== |
| --- chrome_frame/test/net/fake_external_tab.cc (revision 114143) |
| +++ chrome_frame/test/net/fake_external_tab.cc (working copy) |
| @@ -659,21 +659,6 @@ |
| #endif |
| } |
| -// We need a module since some of the accessibility code that gets pulled |
| -// in here uses ATL. |
| -class ObligatoryModule: public CAtlExeModuleT<ObligatoryModule> { |
| - public: |
| - static HRESULT InitializeCom() { |
| - return OleInitialize(NULL); |
| - } |
| - |
| - static void UninitializeCom() { |
| - OleUninitialize(); |
| - } |
| -}; |
| - |
| -ObligatoryModule g_obligatory_atl_module; |
| - |
| const char* IEVersionToString(IEVersion version) { |
| switch (version) { |
| case IE_6: |
| @@ -730,7 +715,7 @@ |
| g_argv = argv; |
| // Temporarily disabled, http://crbug.com/105435. |
|
M-A Ruel
2011/12/13 19:58:20
Remove the comment?
ananta
2011/12/13 20:07:06
Done.
|
| - if (true || chrome_frame_test::GetInstalledIEVersion() >= IE_9) { |
| + if (chrome_frame_test::GetInstalledIEVersion() >= IE_9) { |
| // Adding this here as the command line and the logging stuff gets |
| // initialized in the NetTestSuite constructor. Did not want to break that. |
| base::AtExitManager at_exit_manager; |