summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/sync/engine/auth_watcher.h4
-rw-r--r--chrome/browser/sync/engine/conflict_resolver.h5
-rw-r--r--chrome/browser/sync/engine/syncapi.h4
-rw-r--r--chrome/browser/sync/engine/syncer.h34
-rw-r--r--chrome/browser/sync/engine/syncer_proto_util.h10
-rw-r--r--chrome/browser/sync/engine/syncer_thread.h16
-rw-r--r--chrome/browser/sync/profile_sync_service.h7
-rw-r--r--chrome/browser/sync/sync_setup_flow.h14
-rw-r--r--chrome/browser/sync/syncable/directory_backing_store.h16
-rw-r--r--chrome/browser/sync/syncable/syncable.h8
10 files changed, 61 insertions, 57 deletions
diff --git a/chrome/browser/sync/engine/auth_watcher.h b/chrome/browser/sync/engine/auth_watcher.h
index 2f7b36a..acce5b9 100644
--- a/chrome/browser/sync/engine/auth_watcher.h
+++ b/chrome/browser/sync/engine/auth_watcher.h
@@ -12,6 +12,7 @@
#include <string>
#include "base/atomicops.h"
+#include "base/gtest_prod_util.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/thread.h"
@@ -19,7 +20,6 @@
#include "chrome/browser/sync/util/sync_types.h"
#include "chrome/common/deprecated/event_sys.h"
#include "chrome/common/net/gaia/gaia_authenticator.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
namespace syncable {
struct DirectoryManagerEvent;
@@ -77,7 +77,7 @@ struct AuthWatcherEvent {
// invoked authentication.
class AuthWatcher : public base::RefCountedThreadSafe<AuthWatcher> {
friend class AuthWatcherTest;
- FRIEND_TEST(AuthWatcherTest, Construction);
+ FRIEND_TEST_ALL_PREFIXES(AuthWatcherTest, Construction);
public:
// Normal progression is local -> gaia -> token.
enum Status { LOCALLY_AUTHENTICATED, GAIA_AUTHENTICATED, NOT_AUTHENTICATED };
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index cc8a47c..5157077 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -12,9 +12,9 @@
#include <string>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "chrome/browser/sync/engine/syncer_types.h"
#include "chrome/common/deprecated/event_sys.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
namespace syncable {
class BaseTransaction;
@@ -31,7 +31,8 @@ class StatusController;
class ConflictResolver {
friend class SyncerTest;
- FRIEND_TEST(SyncerTest, ConflictResolverMergeOverwritesLocalEntry);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest,
+ ConflictResolverMergeOverwritesLocalEntry);
public:
ConflictResolver();
~ConflictResolver();
diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h
index 7b2b1658..b363188 100644
--- a/chrome/browser/sync/engine/syncapi.h
+++ b/chrome/browser/sync/engine/syncapi.h
@@ -43,13 +43,13 @@
#include "base/basictypes.h"
#include "base/file_path.h"
+#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
#include "build/build_config.h"
#include "chrome/browser/google_service_auth_error.h"
#include "chrome/browser/sync/notification_method.h"
#include "chrome/browser/sync/syncable/model_type.h"
#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // for FRIEND_TEST
namespace browser_sync {
class ModelSafeWorkerRegistrar;
@@ -232,7 +232,7 @@ class BaseNode {
void* operator new(size_t size);
friend class SyncApiTest;
- FRIEND_TEST(SyncApiTest, GenerateSyncableHash);
+ FRIEND_TEST_ALL_PREFIXES(SyncApiTest, GenerateSyncableHash);
DISALLOW_COPY_AND_ASSIGN(BaseNode);
};
diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h
index a6ec56e7..df28ee4 100644
--- a/chrome/browser/sync/engine/syncer.h
+++ b/chrome/browser/sync/engine/syncer.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "base/lock.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/sync/engine/conflict_resolver.h"
@@ -21,7 +22,6 @@
#include "chrome/browser/sync/util/extensions_activity_monitor.h"
#include "chrome/common/deprecated/event_sys.h"
#include "chrome/common/deprecated/event_sys-inl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
namespace syncable {
class Directory;
@@ -166,21 +166,23 @@ class Syncer {
Closure* pre_conflict_resolution_closure_;
friend class SyncerTest;
- FRIEND_TEST(SyncerTest, NameClashWithResolver);
- FRIEND_TEST(SyncerTest, IllegalAndLegalUpdates);
- FRIEND_TEST(SusanDeletingTest,
- NewServerItemInAFolderHierarchyWeHaveDeleted3);
- FRIEND_TEST(SyncerTest, TestCommitListOrderingAndNewParent);
- FRIEND_TEST(SyncerTest, TestCommitListOrderingAndNewParentAndChild);
- FRIEND_TEST(SyncerTest, TestCommitListOrderingCounterexample);
- FRIEND_TEST(SyncerTest, TestCommitListOrderingWithNesting);
- FRIEND_TEST(SyncerTest, TestCommitListOrderingWithNewItems);
- FRIEND_TEST(SyncerTest, TestGetUnsyncedAndSimpleCommit);
- FRIEND_TEST(SyncerTest, UnappliedUpdateDuringCommit);
- FRIEND_TEST(SyncerTest, DeletingEntryInFolder);
- FRIEND_TEST(SyncerTest, LongChangelistCreatesFakeOrphanedEntries);
- FRIEND_TEST(SyncerTest, QuicklyMergeDualCreatedHierarchy);
- FRIEND_TEST(SyncerTest, LongChangelistWithApplicationConflict);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, NameClashWithResolver);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, IllegalAndLegalUpdates);
+ FRIEND_TEST_ALL_PREFIXES(SusanDeletingTest,
+ NewServerItemInAFolderHierarchyWeHaveDeleted3);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingAndNewParent);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest,
+ TestCommitListOrderingAndNewParentAndChild);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingCounterexample);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingWithNesting);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestCommitListOrderingWithNewItems);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, TestGetUnsyncedAndSimpleCommit);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, UnappliedUpdateDuringCommit);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryInFolder);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest,
+ LongChangelistCreatesFakeOrphanedEntries);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, QuicklyMergeDualCreatedHierarchy);
+ FRIEND_TEST_ALL_PREFIXES(SyncerTest, LongChangelistWithApplicationConflict);
DISALLOW_COPY_AND_ASSIGN(Syncer);
};
diff --git a/chrome/browser/sync/engine/syncer_proto_util.h b/chrome/browser/sync/engine/syncer_proto_util.h
index 1422b83..fd3089f 100644
--- a/chrome/browser/sync/engine/syncer_proto_util.h
+++ b/chrome/browser/sync/engine/syncer_proto_util.h
@@ -7,10 +7,10 @@
#include <string>
+#include "base/gtest_prod_util.h"
#include "chrome/browser/sync/syncable/blob.h"
#include "chrome/browser/sync/syncable/model_type.h"
#include "chrome/browser/sync/util/sync_types.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
namespace syncable {
class Directory;
@@ -109,11 +109,9 @@ class SyncerProtoUtil {
sync_pb::ClientToServerResponse* response);
friend class SyncerProtoUtilTest;
-
- FRIEND_TEST(SyncerProtoUtilTest, AddRequestBirthday);
- FRIEND_TEST(SyncerProtoUtilTest, PostAndProcessHeaders);
- FRIEND_TEST(SyncerProtoUtilTest, VerifyResponseBirthday);
-
+ FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, AddRequestBirthday);
+ FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, PostAndProcessHeaders);
+ FRIEND_TEST_ALL_PREFIXES(SyncerProtoUtilTest, VerifyResponseBirthday);
DISALLOW_COPY_AND_ASSIGN(SyncerProtoUtil);
};
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index 5a34b97..8801b63 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:
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 9d97e4d..769b9dc 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -9,6 +9,7 @@
#include <map>
#include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
#include "base/observer_list.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
@@ -23,7 +24,6 @@
#include "chrome/common/notification_observer.h"
#include "chrome/common/notification_registrar.h"
#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
class NotificationDetails;
class NotificationSource;
@@ -337,8 +337,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
friend class ProfileSyncServiceTest;
friend class ProfileSyncServicePreferenceTest;
friend class ProfileSyncServiceTestHarness;
- FRIEND_TEST(ProfileSyncServiceTest, InitialState);
- FRIEND_TEST(ProfileSyncServiceTest, UnrecoverableErrorSuspendsService);
+ FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest, InitialState);
+ FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceTest,
+ UnrecoverableErrorSuspendsService);
// Initializes the various settings from the command line.
void InitSettings();
diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h
index 9aa4379..b7dfe24 100644
--- a/chrome/browser/sync/sync_setup_flow.h
+++ b/chrome/browser/sync/sync_setup_flow.h
@@ -9,6 +9,7 @@
#include <vector>
#include "app/l10n_util.h"
+#include "base/gtest_prod_util.h"
#include "base/time.h"
#include "chrome/browser/dom_ui/html_dialog_ui.h"
#include "chrome/browser/sync/profile_sync_service.h"
@@ -22,7 +23,6 @@
#endif
#include "gfx/native_widget_types.h"
#include "grit/generated_resources.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
class FlowHandler;
class SyncSetupFlowContainer;
@@ -128,12 +128,12 @@ class SyncSetupFlow : public HtmlDialogUIDelegate {
}
private:
- FRIEND_TEST(SyncSetupWizardTest, InitialStepLogin);
- FRIEND_TEST(SyncSetupWizardTest, InitialStepMergeAndSync);
- FRIEND_TEST(SyncSetupWizardTest, DialogCancelled);
- FRIEND_TEST(SyncSetupWizardTest, InvalidTransitions);
- FRIEND_TEST(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
- FRIEND_TEST(SyncSetupWizardTest, DiscreteRun);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepLogin);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InitialStepMergeAndSync);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DialogCancelled);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, InvalidTransitions);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, FullSuccessfulRunSetsPref);
+ FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRun);
// Use static Run method to get an instance.
SyncSetupFlow(SyncSetupWizard::State start_state,
diff --git a/chrome/browser/sync/syncable/directory_backing_store.h b/chrome/browser/sync/syncable/directory_backing_store.h
index 4624b08..4e4ab19 100644
--- a/chrome/browser/sync/syncable/directory_backing_store.h
+++ b/chrome/browser/sync/syncable/directory_backing_store.h
@@ -9,10 +9,10 @@
#include <string>
#include "base/file_path.h"
+#include "base/gtest_prod_util.h"
#include "chrome/browser/sync/syncable/dir_open_result.h"
#include "chrome/browser/sync/syncable/model_type.h"
#include "chrome/browser/sync/syncable/syncable.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
extern "C" {
struct sqlite3;
@@ -76,13 +76,13 @@ class DirectoryBackingStore {
virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot);
private:
- FRIEND_TEST(DirectoryBackingStoreTest, MigrateVersion67To68);
- FRIEND_TEST(DirectoryBackingStoreTest, MigrateVersion68To69);
- FRIEND_TEST(DirectoryBackingStoreTest, MigrateVersion69To70);
- FRIEND_TEST(DirectoryBackingStoreTest, MigrateVersion70To71);
- FRIEND_TEST(DirectoryBackingStoreTest, ModelTypeIds);
- FRIEND_TEST(DirectoryBackingStoreTest, Corruption);
- FRIEND_TEST(MigrationTest, ToCurrentVersion);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion67To68);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion68To69);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion69To70);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion70To71);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, ModelTypeIds);
+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, Corruption);
+ FRIEND_TEST_ALL_PREFIXES(MigrationTest, ToCurrentVersion);
// General Directory initialization and load helpers.
DirOpenResult InitializeTables();
diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
index b5c196a..b6e8dca 100644
--- a/chrome/browser/sync/syncable/syncable.h
+++ b/chrome/browser/sync/syncable/syncable.h
@@ -17,6 +17,7 @@
#include "base/atomicops.h"
#include "base/basictypes.h"
#include "base/file_path.h"
+#include "base/gtest_prod_util.h"
#include "base/lock.h"
#include "base/time.h"
#include "chrome/browser/sync/protocol/sync.pb.h"
@@ -30,7 +31,6 @@
#include "chrome/browser/sync/util/row_iterator.h"
#include "chrome/browser/sync/util/sync_types.h"
#include "chrome/common/deprecated/event_sys.h"
-#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST
struct PurgeInfo;
@@ -668,8 +668,10 @@ class Directory {
friend class ScopedKernelUnlock;
friend class WriteTransaction;
friend class SyncableDirectoryTest;
- FRIEND_TEST(SyncableDirectoryTest, TakeSnapshotGetsAllDirtyHandlesTest);
- FRIEND_TEST(SyncableDirectoryTest, TakeSnapshotGetsOnlyDirtyHandlesTest);
+ FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
+ TakeSnapshotGetsAllDirtyHandlesTest);
+ FRIEND_TEST_ALL_PREFIXES(SyncableDirectoryTest,
+ TakeSnapshotGetsOnlyDirtyHandlesTest);
public:
// Various data that the Directory::Kernel we are backing (persisting data
generated by cgit v1.1 at 2025-02-12 21:16:44 +0000