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/task_manager.h | |
| 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/task_manager.h')
| -rw-r--r-- | chrome/browser/task_manager.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index 6f807b8..21cb7e6 100644 --- a/chrome/browser/task_manager.h +++ b/chrome/browser/task_manager.h @@ -11,6 +11,7 @@ #include <vector> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/lock.h" #include "base/observer_list.h" #include "base/process_util.h" @@ -19,7 +20,6 @@ #include "base/timer.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "net/url_request/url_request_job_tracker.h" -#include "testing/gtest/include/gtest/gtest_prod.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; @@ -148,9 +148,9 @@ class TaskManager { void OpenAboutMemory(); private: - FRIEND_TEST(TaskManagerTest, Basic); - FRIEND_TEST(TaskManagerTest, Resources); - FRIEND_TEST(TaskManagerTest, RefreshCalled); + FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Basic); + FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Resources); + FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled); // Obtain an instance via GetInstance(). TaskManager(); @@ -261,7 +261,7 @@ class TaskManagerModel : public URLRequestJobTracker::JobObserver, private: friend class base::RefCountedThreadSafe<TaskManagerModel>; - FRIEND_TEST(TaskManagerTest, RefreshCalled); + FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled); ~TaskManagerModel(); |