Adding a Set() method for copying a variant over to the ScopedVariant....

base/scoped_variant_win.cc

Index: base/scoped_variant_win.cc
===================================================================
--- base/scoped_variant_win.cc	(revision 12478)
+++ base/scoped_variant_win.cc	(working copy)
@@ -28,6 +28,21 @@
   var_.lVal = value;
 }
 
+ScopedVariant::ScopedVariant(IDispatch* dispatch) {
+  var_.vt = VT_EMPTY;
+  Set(dispatch);
+}
+
+ScopedVariant::ScopedVariant(IUnknown* unknown) {
+  var_.vt = VT_EMPTY;
+  Set(unknown);
+}
+
+ScopedVariant::ScopedVariant(const VARIANT& var) {
+  var_.vt = VT_EMPTY;
+  Set(var);
+}
+
 void ScopedVariant::Reset(const VARIANT& var) {
   if (&var != &var_) {
     ::VariantClear(&var_);
@@ -187,6 +202,22 @@
   }
 }
 
+void ScopedVariant::Set(const VARIANT& var) {
+  DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
+  if (FAILED(::VariantCopy(&var_, &var))) {
+    DLOG(ERROR) << "VariantCopy failed";
+    var_.vt = VT_EMPTY;
+  }
+}
+
+ScopedVariant& ScopedVariant::operator=(const VARIANT& var) {
+  if (&var != &var_) {
+    VariantClear(&var_);
+    Set(var);
+  }
+  return *this;
+}
+
 bool ScopedVariant::IsLeakableVarType(VARTYPE vt) {
   bool leakable = false;
   switch (vt & VT_TYPEMASK) {