diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 14:30:51 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-01 14:30:51 +0000 |
| commit | a918f877c38b7a0bc684a2963fba4a4341a243e8 (patch) | |
| tree | b58938b92989fa1a75e8e2b0b62c21944d4cd3bb /chrome/browser/metrics | |
| parent | be4d55fe8d843628223a7b40162007ab734d1402 (diff) | |
| download | chromium_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/metrics')
| -rw-r--r-- | chrome/browser/metrics/metrics_service.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h index 09f1ef8..51a22c3 100644 --- a/chrome/browser/metrics/metrics_service.h +++ b/chrome/browser/metrics/metrics_service.h @@ -15,6 +15,7 @@ #include <vector> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/histogram.h" #include "base/scoped_ptr.h" #include "base/values.h" @@ -22,7 +23,6 @@ #include "chrome/common/child_process_info.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/notification_registrar.h" -#include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/glue/plugins/webplugininfo.h" #if defined(OS_CHROMEOS) @@ -510,9 +510,10 @@ class MetricsService : public NotificationObserver, scoped_refptr<chromeos::ExternalMetrics> external_metrics_; #endif - FRIEND_TEST(MetricsServiceTest, ClientIdGeneratesAllZeroes); - FRIEND_TEST(MetricsServiceTest, ClientIdGeneratesCorrectly); - FRIEND_TEST(MetricsServiceTest, ClientIdCorrectlyFormatted); + FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdGeneratesAllZeroes); + FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdGeneratesCorrectly); + FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ClientIdCorrectlyFormatted); + DISALLOW_COPY_AND_ASSIGN(MetricsService); }; |