2 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 8f4c122..95a71b9 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -428,7 +428,6 @@ AutocompleteEditViewWin::AutocompleteEditViewWin(
 
   g_paint_patcher.Pointer()->RefPatch();
 
-  // Note: on Vista and later, the next call implicity calls OleInitialize().
   Create(hwnd, 0, 0, 0, l10n_util::GetExtendedStyles());
   SetReadOnly(popup_window_mode_);
   SetFont(font_.hfont());
@@ -519,12 +518,6 @@ AutocompleteEditViewWin::~AutocompleteEditViewWin() {
   // been destroyed.  This prevents us from relying on the AtExit or static
   // destructor sequence to do our unpatching, which is generally fragile.
   g_paint_patcher.Pointer()->DerefPatch();
-
-  // On Vista and later, the CRichEditCtrl window initializes OLE.
-  // We balance that initialization here.
-  win_util::WinVersion version = win_util::GetWinVersion();
-  if (version >= win_util::WINVERSION_VISTA)
-    OleUninitialize();
 }
 
 void AutocompleteEditViewWin::SaveStateToTab(TabContents* tab) {
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index c34a4d1..99d2d5f 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -45,10 +45,8 @@ ProcessSingleton::ProcessSingleton(const FilePath& user_data_dir)
 }
 
 ProcessSingleton::~ProcessSingleton() {
-  if (window_) {
+  if (window_)
     DestroyWindow(window_);
-    UnregisterClass(chrome::kMessageWindowClass, GetModuleHandle(NULL));
-  }
 }
 
 bool ProcessSingleton::NotifyOtherProcess() {
@@ -144,8 +142,7 @@ void ProcessSingleton::Create() {
   wc.lpfnWndProc = ProcessSingleton::WndProcStatic;
   wc.hInstance = hinst;
   wc.lpszClassName = chrome::kMessageWindowClass;
-  ATOM clazz = RegisterClassEx(&wc);
-  DCHECK(clazz);
+  RegisterClassEx(&wc);
 
   std::wstring user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);