Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Unified Diff: chrome/browser/sync/engine/syncer_thread.h

Issue 2658003: [GTTF] Use FRIEND_TEST_ALL_PREFIXES in chrome/browser/sync (Closed)
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncer_proto_util.h ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_thread.h
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index 5a34b97b22bfcefa1211537191ee30b362aa2612..8801b6387c47ae4ceb882c955326bec1ab3cfaf9 100644
--- a/chrome/browser/sync/engine/syncer_thread.h
+++ b/chrome/browser/sync/engine/syncer_thread.h
@@ -15,6 +15,7 @@
#include "base/basictypes.h"
#include "base/condition_variable.h"
+#include "base/gtest_prod_util.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/thread.h"
@@ -26,7 +27,6 @@
#endif
#include "chrome/browser/sync/sessions/sync_session.h"
#include "chrome/common/deprecated/event_sys-inl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
class EventListenerHookup;
@@ -47,13 +47,13 @@ struct SyncerShutdownEvent;
class SyncerThread : public base::RefCountedThreadSafe<SyncerThread>,
public sessions::SyncSession::Delegate {
- FRIEND_TEST(SyncerThreadTest, CalculateSyncWaitTime);
- FRIEND_TEST(SyncerThreadTest, CalculatePollingWaitTime);
- FRIEND_TEST(SyncerThreadWithSyncerTest, Polling);
- FRIEND_TEST(SyncerThreadWithSyncerTest, Nudge);
- FRIEND_TEST(SyncerThreadWithSyncerTest, Throttling);
- FRIEND_TEST(SyncerThreadWithSyncerTest, AuthInvalid);
- FRIEND_TEST(SyncerThreadWithSyncerTest, DISABLED_Pause);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadTest, CalculateSyncWaitTime);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadTest, CalculatePollingWaitTime);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadWithSyncerTest, Polling);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadWithSyncerTest, Nudge);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadWithSyncerTest, Throttling);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadWithSyncerTest, AuthInvalid);
+ FRIEND_TEST_ALL_PREFIXES(SyncerThreadWithSyncerTest, Pause);
friend class SyncerThreadWithSyncerTest;
friend class SyncerThreadFactory;
public:
« no previous file with comments | « chrome/browser/sync/engine/syncer_proto_util.h ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698