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

components/browser_sync/abstract_profile_sync_service_test.cc

 // 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.
 
-#include "components/browser_sync/browser/abstract_profile_sync_service_test.h"
+#include "components/browser_sync/abstract_profile_sync_service_test.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
-#include "components/browser_sync/browser/test_http_bridge_factory.h"
-#include "components/browser_sync/browser/test_profile_sync_service.h"
+#include "components/browser_sync/test_http_bridge_factory.h"
+#include "components/browser_sync/test_profile_sync_service.h"
 #include "components/sync/core/test/sync_manager_factory_for_profile_sync_test.h"
 #include "components/sync/core/test/test_internal_components_factory.h"
 #include "components/sync/core/test/test_user_share.h"
 #include "components/sync/driver/glue/sync_backend_host_core.h"
 #include "components/sync/driver/sync_api_component_factory_mock.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 using syncer::ModelType;
 using testing::_;
@@ skipping 185 matching lines @@
                     base::Bind(&AbstractProfileSyncServiceTest::sync_service,
                                base::Unretained(this)));
 }
 
 CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test,
                                    ModelType model_type)
     : callback_(base::Bind(&CreateRootHelper::CreateRootCallback,
                            base::Unretained(this))),
       test_(test),
       model_type_(model_type),
-      success_(false) {
-}
+      success_(false) {}
 
-CreateRootHelper::~CreateRootHelper() {
-}
+CreateRootHelper::~CreateRootHelper() {}
 
 const base::Closure& CreateRootHelper::callback() const {
   return callback_;
 }
 
 bool CreateRootHelper::success() {
   return success_;
 }
 
 void CreateRootHelper::CreateRootCallback() {
   success_ = test_->CreateRoot(model_type_);
 }