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

chrome_frame/urlmon_url_request.h

 // Copyright (c) 2011 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_URLMON_URL_REQUEST_H_
 #define CHROME_FRAME_URLMON_URL_REQUEST_H_
 
 #include <urlmon.h>
 #include <atlbase.h>
 #include <atlcom.h>
 #include <map>
 #include <string>
 
 #include "base/threading/thread.h"
 #include "chrome_frame/plugin_url_request.h"
 #include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/utils.h"
 
+namespace base {
+namespace win {
+class ScopedCOMInitializer;
+}
+}
+
 class UrlmonUrlRequest;
 
 class UrlmonUrlRequestManager
     : public PluginUrlRequestManager,
       public PluginUrlRequestDelegate {
  public:
   // Sub resources on the pages in chrome frame are fetched on this thread.
   class ResourceFetcherThread : public base::Thread {
    public:
     explicit ResourceFetcherThread(const char* name);
     virtual ~ResourceFetcherThread();
 
     virtual void Init();
     virtual void CleanUp();
+
+   private:
+    scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+
+    DISALLOW_COPY_AND_ASSIGN(ResourceFetcherThread);
   };
 
   // Contains the privacy information for all requests issued by this instance.
   struct PrivacyInfo {
    public:
     struct PrivacyEntry {
       PrivacyEntry() : flags(0) {}
       std::wstring policy_ref;
       int32 flags;
     };
@@ skipping 109 matching lines @@
   // The window to be used to fire notifications on.
   HWND notification_window_;
   // Set to true if the ChromeFrame instance is running in privileged mode.
   bool privileged_mode_;
   // A pointer to the containing object. We maintain a weak reference to avoid
   // lifetime issues.
   IUnknown* container_;
 };
 
 #endif  // CHROME_FRAME_URLMON_URL_REQUEST_H_