[GTTF] Use FRIEND_TEST_ALL_PREFIXES in chrome/browser/sync

chrome/browser/sync/engine/conflict_resolver.h

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A class that watches the syncer and attempts to resolve any conflicts that
 // occur.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
 
 #include <set>
 #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;
 class Id;
 class MutableEntry;
 class ScopedDirLookup;
 class WriteTransaction;
 }  // namespace syncable
 
 namespace browser_sync {
 namespace sessions {
 class StatusController;
 }
 
 class ConflictResolver {
   friend class SyncerTest;
-  FRIEND_TEST(SyncerTest, ConflictResolverMergeOverwritesLocalEntry);
+  FRIEND_TEST_ALL_PREFIXES(SyncerTest,
+                           ConflictResolverMergeOverwritesLocalEntry);
  public:
   ConflictResolver();
   ~ConflictResolver();
   // Called by the syncer at the end of a update/commit cycle.
   // Returns true if the syncer should try to apply its updates again.
   bool ResolveConflicts(const syncable::ScopedDirLookup& dir,
                         sessions::StatusController* status);
 
  private:
   // We keep a map to record how often we've seen each conflict set. We use this
@@ skipping 43 matching lines @@
   // deep trees. Used to happen in store refresh.
   // TODO(chron): Can we get rid of this optimization?
   std::set<syncable::Id> children_of_merged_dirs_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_