summaryrefslogtreecommitdiffstats
path: root/base/win
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 09:08:11 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-10 09:08:11 +0000
commitfb0e5203f30c303c5fd494b80393d79fbca03e57 (patch)
tree5d434bc6753e21a0fa85fbcda201a9d5f18d4d63 /base/win
parent44bbe5e6d3931dfe67f12a926f0e2f5d589daf30 (diff)
downloadchromium_src-fb0e5203f30c303c5fd494b80393d79fbca03e57.zip
chromium_src-fb0e5203f30c303c5fd494b80393d79fbca03e57.tar.gz
chromium_src-fb0e5203f30c303c5fd494b80393d79fbca03e57.tar.bz2
Remove #ifdef OFFICIAL_BUILD from scoped variant unittest, as the code is now always compiled
BUG=none TEST=none Review URL: http://codereview.chromium.org/8890067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
-rw-r--r--base/win/scoped_variant_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/base/win/scoped_variant_unittest.cc b/base/win/scoped_variant_unittest.cc
index 2cd5be1..1f017cf 100644
--- a/base/win/scoped_variant_unittest.cc
+++ b/base/win/scoped_variant_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -251,9 +251,7 @@ TEST(ScopedVariantTest, ScopedVariant) {
ASSERT_TRUE(sa != NULL);
var.Set(sa);
-#ifndef OFFICIAL_BUILD
EXPECT_TRUE(ScopedVariant::IsLeakableVarType(var.type()));
-#endif
EXPECT_EQ(VT_ARRAY | VT_UI1, var.type());
EXPECT_EQ(sa, V_ARRAY(&var));
// The array is destroyed in the destructor of var.