diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 01:32:15 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 01:32:15 +0000 |
| commit | 3289a82a55e7dbc9badac7d503e11ba5d5cb334c (patch) | |
| tree | 37a614e52cc65256314821bb77a46c723312ab3d /chrome/browser/importer | |
| parent | 1680547c393e3be66f7537a950635dd087e088de (diff) | |
| download | chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.zip chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.tar.gz chromium_src-3289a82a55e7dbc9badac7d503e11ba5d5cb334c.tar.bz2 | |
Eliminate duplicate COM and OLE initializations.
This is take 2; the original patch ( http://crrev.com/159815 ), which only dealt with OLE, broke a few tests. The OneClickSignIn tests were skipping the RenderViewHostTestHarness SetUp() method, while the Accessibility tests directly muck with Widgets and thus have to manually init OLE.
BUG=none
TEST=Fewer "Multiple OleInitialize..." messages in tests
Review URL: https://codereview.chromium.org/11031059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/ie_importer.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 7bef316..55bb95d 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -24,7 +24,6 @@ #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_co_mem.h" -#include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" @@ -415,9 +414,6 @@ void IEImporter::StartImport(const importer::SourceProfile& source_profile, bridge_->NotifyStarted(); - // Some IE settings (such as Protected Storage) are obtained via COM APIs. - base::win::ScopedCOMInitializer com_initializer; - if ((items & importer::HOME_PAGE) && !cancelled()) ImportHomepage(); // Doesn't have a UI item. // The order here is important! |