[Sync] Merge //components/browser_sync into one directory.

components/browser_sync/abstract_profile_sync_service_test.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.
 
-#ifndef COMPONENTS_BROWSER_SYNC_BROWSER_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_
-#define COMPONENTS_BROWSER_SYNC_BROWSER_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_
+#ifndef COMPONENTS_BROWSER_SYNC_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_
+#define COMPONENTS_BROWSER_SYNC_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/test/test_message_loop.h"
-#include "components/browser_sync/browser/profile_sync_test_util.h"
+#include "components/browser_sync/profile_sync_test_util.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/core/change_record.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestProfileSyncService;
 
 namespace syncer {
 struct UserShare;
 }  //  namespace syncer
 
@@ skipping 69 matching lines @@
   void CreateRootCallback();
 
   base::Closure callback_;
   AbstractProfileSyncServiceTest* test_;
   syncer::ModelType model_type_;
   bool success_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateRootHelper);
 };
 
-#endif  // COMPONENTS_BROWSER_SYNC_BROWSER_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_
+#endif  // COMPONENTS_BROWSER_SYNC_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_