Use ScopedCOMInitializer in more places. While this doesn't always simplify code, it does mean we …

chrome_frame/utils.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_FRAME_UTILS_H_
 #define CHROME_FRAME_UTILS_H_
 
 #include <OAidl.h>
 #include <objidl.h>
 #include <windows.h>
 #include <wininet.h>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/threading/thread.h"
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 class FilePath;
 class RegistryListPreferencesHolder;
 interface IBrowserService;
 interface IWebBrowser2;
 struct ContextMenuModel;
 
@@ skipping 362 matching lines @@
         QueryInterfaceIfDelegateSupports<_ComMapClass>)
 
 // Queries the delegated COM object for an interface, bypassing the wrapper.
 #define COM_INTERFACE_BLIND_DELEGATE() \
     COM_INTERFACE_ENTRY_FUNC_BLIND(0, CheckOutgoingInterface<_ComMapClass>)
 
 // Thread that enters STA and has a UI message loop.
 class STAThread : public base::Thread {
  public:
   explicit STAThread(const char *name) : Thread(name) {}
-  ~STAThread() {
+  virtual ~STAThread() {
     Stop();
   }
+
   bool Start() {
     return StartWithOptions(Options(MessageLoop::TYPE_UI, 0));
   }
+
  protected:
-  // Called just prior to starting the message loop
   virtual void Init() {

[grt (UTC plus 2), 2012/10/03 13:37:28]

OVERRIDE

-    ::CoInitialize(0);
+    com_initializer_.reset(new base::win::ScopedCOMInitializer());
   }
 
-  // Called just after the message loop ends
   virtual void CleanUp() {

[grt (UTC plus 2), 2012/10/03 13:37:28]

OVERRIDE

-    ::CoUninitialize();
+    com_initializer_.reset();
   }
+
+ private:
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+
+  DISALLOW_COPY_AND_ASSIGN(STAThread);
 };
 
 std::wstring GuidToString(const GUID& guid);
 
 // The urls retrieved from the IMoniker interface don't contain the anchor
 // portion of the actual url navigated to. This function checks whether the
 // url passed in the bho_url parameter contains an anchor and if yes checks
 // whether it matches the url retrieved from the moniker. If yes it returns
 // the bho url, if not the moniker url.
 std::wstring GetActualUrlFromMoniker(IMoniker* moniker,
@@ skipping 192 matching lines @@
 // increase the connection count once per process.
 // Returns true on success.
 bool IncreaseWinInetConnections(DWORD connections);
 
 // Sets |profile_path| to the path for the Chrome Frame |profile_name|
 // profile.
 void GetChromeFrameProfilePath(const string16& profile_name,
                                FilePath* profile_path);
 
 #endif  // CHROME_FRAME_UTILS_H_