Fixing problem with ScopedVariant in official builds.

base/scoped_variant_win.cc

 // Copyright (c) 2009 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/scoped_variant_win.h"
 #include "base/logging.h"
 
 // Global, const instance of an empty variant.
 const VARIANT ScopedVariant::kEmptyVariant = { VT_EMPTY };
 
@@ skipping 169 matching lines @@
   DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
   if (SUCCEEDED(::SafeArrayGetVartype(array, &var_.vt))) {
     var_.vt |= VT_ARRAY;
     var_.parray = array;
   } else {
     DCHECK(array == NULL) << "Unable to determine safearray vartype";
     var_.vt = VT_EMPTY;
   }
 }
 
-#ifndef OFFICIAL_BUILD
 bool ScopedVariant::IsLeakableVarType(VARTYPE vt) {
   bool leakable = false;
   switch (vt & VT_TYPEMASK) {
     case VT_BSTR:
     case VT_DISPATCH:
     // we treat VT_VARIANT as leakable to err on the safe side.
     case VT_VARIANT:
     case VT_UNKNOWN:
     case VT_SAFEARRAY:
 
@@ skipping 19 matching lines @@
       leakable = true;
       break;
   }
 
   if (!leakable && (vt & VT_ARRAY) != 0) {
     leakable = true;
   }
 
   return leakable;
 }
-#endif