diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 14:45:53 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 14:45:53 +0000 |
| commit | 225020ce43ccb72f34a73c62dd4aec7861ea94d6 (patch) | |
| tree | 6076da069cbd48ee45f88ea923eeb8a609f8be6a /sandbox/src/interception.h | |
| parent | 2c5c7e875ce6da463ae266f2183a529101c6f96c (diff) | |
| download | chromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.zip chromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.tar.gz chromium_src-225020ce43ccb72f34a73c62dd4aec7861ea94d6.tar.bz2 | |
Replace all usages of FRIEND_TEST() with FRIEND_TEST_ALL_PREFIXES()
BUG=105287
TEST=NONE
Review URL: http://codereview.chromium.org/8678017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/interception.h')
| -rw-r--r-- | sandbox/src/interception.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sandbox/src/interception.h b/sandbox/src/interception.h index 3dd3639..c02b0ff 100644 --- a/sandbox/src/interception.h +++ b/sandbox/src/interception.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 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. @@ -13,12 +13,9 @@ #include <string> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "sandbox/src/sandbox_types.h" -#pragma warning(push, 3) -#include "testing/gtest/include/gtest/gtest.h" -#pragma warning(pop) - namespace sandbox { class TargetProcess; @@ -60,8 +57,10 @@ struct DllInterceptionData; // class InterceptionManager { // The unit test will access private members. - FRIEND_TEST(InterceptionManagerTest, BufferLayout1); - FRIEND_TEST(InterceptionManagerTest, BufferLayout2); + // Allow tests to be marked DISABLED_. Note that FLAKY_ and FAILS_ prefixes + // do not work with sandbox tests. + FRIEND_TEST_ALL_PREFIXES(InterceptionManagerTest, BufferLayout1); + FRIEND_TEST_ALL_PREFIXES(InterceptionManagerTest, BufferLayout2); public: // An interception manager performs interceptions on a given child process. |