summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_init.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 14:30:51 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 14:30:51 +0000
commita918f877c38b7a0bc684a2963fba4a4341a243e8 (patch)
treeb58938b92989fa1a75e8e2b0b62c21944d4cd3bb /chrome/browser/browser_init.h
parentbe4d55fe8d843628223a7b40162007ab734d1402 (diff)
downloadchromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.zip
chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.gz
chromium_src-a918f877c38b7a0bc684a2963fba4a4341a243e8.tar.bz2
[GTTF] Add FRIEND_TEST_ALL_PREFIXES, a FRIEND_TEST replacement
that works with all test prefixes (DISABLED, FLAKY, FAILS). TEST=none BUG=44549 Review URL: http://codereview.chromium.org/2439001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.h')
-rw-r--r--chrome/browser/browser_init.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h
index 891c90b..a38326c 100644
--- a/chrome/browser/browser_init.h
+++ b/chrome/browser/browser_init.h
@@ -9,8 +9,8 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
class Browser;
class CommandLine;
@@ -129,8 +129,7 @@ class BrowserInit {
const std::vector<Tab>& tabs);
private:
- FRIEND_TEST(BrowserTest, RestorePinnedTabs);
- FRIEND_TEST(BrowserTest, DISABLED_RestorePinnedTabs);
+ FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs);
// If the process was launched with the web application command line flags,
// e.g. --app=http://www.google.com/ or --app_id=... return true.