Fix some issues found looking at the code....

base/base_drop_target.h

 // Copyright (c) 2006-2008 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 BASE_BASE_DROP_TARGET_H__
-#define BASE_BASE_DROP_TARGET_H__
+#ifndef BASE_BASE_DROP_TARGET_H_
+#define BASE_BASE_DROP_TARGET_H_
 
-#include <atlbase.h>
 #include <objidl.h>
-#include <shobjidl.h>
 
-#include "base/basictypes.h"
+#include "base/ref_counted.h"
+
+struct IDropTargetHelper;
 
 // A DropTarget implementation that takes care of the nitty gritty
 // of dnd. While this class is concrete, subclasses will most likely
 // want to override various OnXXX methods.
 //
 // Because BaseDropTarget is ref counted you shouldn't delete it directly,
 // rather wrap it in a scoped_refptr. Be sure and invoke RevokeDragDrop(m_hWnd)
 // before the HWND is deleted too.
+//
+// This class is meant to be used in a STA and is not multithread-safe.

[Dean McNamee, 2008/09/30 20:47:26]

an STA, I think

 class BaseDropTarget : public IDropTarget {
  public:
   // Create a new BaseDropTarget associating it with the given HWND.
   explicit BaseDropTarget(HWND hwnd);
   virtual ~BaseDropTarget();
 
   // When suspend is set to |true|, the drop target does not receive drops from
   // drags initiated within the owning HWND.
   // TODO(beng): (http://b/1085385) figure out how we will handle legitimate
   //             drag-drop operations within the same HWND, such as dragging
@@ skipping 51 matching lines @@
                        DWORD key_state,
                        POINT cursor_position,
                        DWORD effect);
 
  private:
   // Returns the cached drop helper, creating one if necessary. The returned
   // object is not addrefed. May return NULL if the object couldn't be created.
   static IDropTargetHelper* DropHelper();
 
   // The data object currently being dragged over this drop target.
-  CComPtr<IDataObject> current_data_object_;
+  scoped_refptr<IDataObject> current_data_object_;
 
   // A helper object that is used to provide drag image support while the mouse
   // is dragging over the content area.
   //
   // DO NOT ACCESS DIRECTLY! Use DropHelper() instead, which will lazily create
   // this if it doesn't exist yet. This object can take tens of milliseconds to
   // create, and we don't want to block any window opening for this, especially
   // since often, DnD will never be used. Instead, we force this penalty to the
   // first time it is actually used.
   static IDropTargetHelper* cached_drop_target_helper_;
 
   // The HWND of the source. This HWND is used to determine coordinates for
   // mouse events that are sent to the renderer notifying various drag states.
   HWND hwnd_;
 
   // Whether or not we are currently processing drag notifications for drags
   // initiated in this window.
   bool suspend_;
 
   LONG ref_count_;
 
   DISALLOW_EVIL_CONSTRUCTORS(BaseDropTarget);
 };
 
-#endif  // BASE_BASE_DROP_TARGET_H__
-
+#endif  // BASE_BASE_DROP_TARGET_H_