[GTTF] Use FRIEND_TEST_ALL_PREFIXES in chrome/browser/sync

chrome/browser/sync/engine/conflict_resolver.h

Index: chrome/browser/sync/engine/conflict_resolver.h
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index cc8a47c678ac421630da3c7fb452eafe33ca9bb9..5157077f632de568d045d1999cdafb5201ca7b6e 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();