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

chrome/browser/sync/test/integration/single_client_typed_urls_sync_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 "base/macros.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
-#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/browser_sync/profile_sync_service.h"
 #include "components/history/core/browser/history_types.h"
 
 using sync_integration_test_util::AwaitCommitActivityCompletion;
 using typed_urls_helper::AddUrlToHistory;
 using typed_urls_helper::AddUrlToHistoryWithTransition;
 using typed_urls_helper::CheckAllProfilesHaveSameURLs;
 using typed_urls_helper::DeleteUrlFromHistory;
 using typed_urls_helper::GetTypedUrlsFromClient;
 
 const std::string kSanityHistoryUrl = "http://www.sanity-history.google.com";
@@ skipping 90 matching lines @@
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   ASSERT_TRUE(CheckAllProfilesHaveSameURLs());
 
   // Now delete the URL we just added, wait for sync and verify the deletion.
   DeleteUrlFromHistory(0, new_url);
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
   ASSERT_TRUE(CheckAllProfilesHaveSameURLs());
 }