diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 12:30:18 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 12:30:18 +0000 |
| commit | a1889f8a2b53d87f1db215a63eee0a13ef43b886 (patch) | |
| tree | 8ba605b3e78c5a5bf138a03cc3c8fa3983987fe4 /chrome/browser/metrics | |
| parent | 2fe47d910b1e4652dadec72ef915daba615767dc (diff) | |
| download | chromium_src-a1889f8a2b53d87f1db215a63eee0a13ef43b886.zip chromium_src-a1889f8a2b53d87f1db215a63eee0a13ef43b886.tar.gz chromium_src-a1889f8a2b53d87f1db215a63eee0a13ef43b886.tar.bz2 | |
Use FRIEND_TEST_ALL_PREFIXES so that disabling tests does not break the build.
Interestingly, gtest_prod_util were #included...
TBR=rtenneti
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/6603014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics')
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h index c98af72..b9fb6e0 100644 --- a/chrome/browser/metrics/thread_watcher.h +++ b/chrome/browser/metrics/thread_watcher.h @@ -132,11 +132,11 @@ class ThreadWatcher { friend class ThreadWatcherList; // Allow tests to access our innards for testing purposes. - FRIEND_TEST(ThreadWatcherTest, Registration); - FRIEND_TEST(ThreadWatcherTest, ThreadResponding); - FRIEND_TEST(ThreadWatcherTest, ThreadNotResponding); - FRIEND_TEST(ThreadWatcherTest, MultipleThreadsResponding); - FRIEND_TEST(ThreadWatcherTest, MultipleThreadsNotResponding); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, Registration); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, ThreadResponding); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, ThreadNotResponding); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, MultipleThreadsResponding); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, MultipleThreadsNotResponding); // Post constructor initialization. void Initialize(); @@ -225,7 +225,7 @@ class ThreadWatcherList : public NotificationObserver { private: // Allow tests to access our innards for testing purposes. - FRIEND_TEST(ThreadWatcherTest, Registration); + FRIEND_TEST_ALL_PREFIXES(ThreadWatcherTest, Registration); // Delete all thread watcher objects and remove them from global map. // This method is accessible on WatchDogThread. |