[Sync] Moved down comments directly following copyright.

components/sync/engine_impl/conflict_resolver.h

 // Copyright (c) 2012 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 COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
 #define COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "components/sync/engine_impl/syncer_types.h"
 
 namespace syncer {
 
 namespace syncable {
 class Id;
 class WriteTransaction;
 }  // namespace syncable
 
 class Cryptographer;
 class StatusController;
 struct UpdateCounters;
 
+// A class that watches the syncer and attempts to resolve any conflicts that
+// occur.
 class ConflictResolver {
  public:
   // Enumeration of different conflict resolutions. Used for histogramming.
   enum SimpleConflictResolutions {
     OVERWRITE_LOCAL,    // Resolved by overwriting local changes.
     OVERWRITE_SERVER,   // Resolved by overwriting server changes.
     UNDELETE,           // Resolved by undeleting local item.
     IGNORE_ENCRYPTION,  // Resolved by ignoring an encryption-only server
                         // change.
     NIGORI_MERGE,       // Resolved by merging nigori nodes.
@@ skipping 22 matching lines @@
                              const Cryptographer* cryptographer,
                              StatusController* status,
                              UpdateCounters* counters);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_CONFLICT_RESOLVER_H_