| Index: chrome/browser/sync/profile_sync_service.h
|
| diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
|
| index 2054675cc5213acdd556b2c0edfe134c45bea415..dc536e1203ec9ce56445fc77f32b8e61b8634b38 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;
|
| @@ -328,8 +328,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();
|
|
|