Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/win/scoped_variant.cc

 // Copyright (c) 2010 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.
 
 #include "base/win/scoped_variant.h"
 #include "base/logging.h"
 
 namespace base {
 namespace win {
 
 // Global, const instance of an empty variant.
-const VARIANT ScopedVariant::kEmptyVariant = { VT_EMPTY };
+const VARIANT ScopedVariant::kEmptyVariant = {{{VT_EMPTY}}};
 
 ScopedVariant::~ScopedVariant() {
   COMPILE_ASSERT(sizeof(ScopedVariant) == sizeof(VARIANT), ScopedVariantSize);
   ::VariantClear(&var_);
 }
 
 ScopedVariant::ScopedVariant(const wchar_t* str) {
   var_.vt = VT_EMPTY;
   Set(str);
 }
@@ skipping 52 matching lines @@
   var_ = var.var_;
   var.var_ = tmp;
 }
 
 VARIANT* ScopedVariant::Receive() {
   DCHECK(!IsLeakableVarType(var_.vt)) << "variant leak. type: " << var_.vt;
   return &var_;
 }
 
 VARIANT ScopedVariant::Copy() const {
-  VARIANT ret = { VT_EMPTY };
+  VARIANT ret = {{{VT_EMPTY}}};
   ::VariantCopy(&ret, &var_);
   return ret;
 }
 
 int ScopedVariant::Compare(const VARIANT& var, bool ignore_case) const {
   ULONG flags = ignore_case ? NORM_IGNORECASE : 0;
   HRESULT hr = ::VarCmp(const_cast<VARIANT*>(&var_), const_cast<VARIANT*>(&var),
                         LOCALE_USER_DEFAULT, flags);
   int ret = 0;
 
@@ skipping 171 matching lines @@
 
   if (!leakable && (vt & VT_ARRAY) != 0) {
     leakable = true;
   }
 
   return leakable;
 }
 
 }  // namespace win
 }  // namespace base