summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 12:55:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 12:55:12 +0000
commit2effd6d982b9d290534374ebb479decb7e45322c (patch)
tree71f0e91b7b860c2dabc9ad2c40dbb19f66794b08 /chrome/browser
parented04d3da90ffdc053338ed037bb1d92534fb5545 (diff)
downloadchromium_src-2effd6d982b9d290534374ebb479decb7e45322c.zip
chromium_src-2effd6d982b9d290534374ebb479decb7e45322c.tar.gz
chromium_src-2effd6d982b9d290534374ebb479decb7e45322c.tar.bz2
Update FRIEND_TEST to fix the build.
TBR=maruel TEST=none BUG=38522 Review URL: http://codereview.chromium.org/1267003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_init.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h
index 81c3bb2..65d2ca9 100644
--- a/chrome/browser/browser_init.h
+++ b/chrome/browser/browser_init.h
@@ -130,7 +130,7 @@ class BrowserInit {
private:
FRIEND_TEST(BrowserTest, RestorePinnedTabs);
- FRIEND_TEST(BrowserTest, FLAKY_RestorePinnedTabs);
+ FRIEND_TEST(BrowserTest, DISABLED_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.