Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Side by Side Diff: chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <utility> 5 #include <utility>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
11 #include "chrome/browser/sync/test/integration/single_client_status_change_check er.h" 11 #include "chrome/browser/sync/test/integration/single_client_status_change_check er.h"
12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
13 #include "chrome/browser/sync/test/integration/sync_test.h" 13 #include "chrome/browser/sync/test/integration/sync_test.h"
14 #include "components/bookmarks/browser/bookmark_model.h" 14 #include "components/bookmarks/browser/bookmark_model.h"
15 #include "components/browser_sync/browser/profile_sync_service.h" 15 #include "components/browser_sync/profile_sync_service.h"
16 #include "components/sync/test/fake_server/bookmark_entity_builder.h" 16 #include "components/sync/test/fake_server/bookmark_entity_builder.h"
17 #include "components/sync/test/fake_server/entity_builder_factory.h" 17 #include "components/sync/test/fake_server/entity_builder_factory.h"
18 #include "components/sync/test/fake_server/fake_server_verifier.h" 18 #include "components/sync/test/fake_server/fake_server_verifier.h"
19 #include "components/sync/test/fake_server/tombstone_entity.h" 19 #include "components/sync/test/fake_server/tombstone_entity.h"
20 #include "ui/base/layout.h" 20 #include "ui/base/layout.h"
21 21
22 using bookmarks::BookmarkModel; 22 using bookmarks::BookmarkModel;
23 using bookmarks::BookmarkNode; 23 using bookmarks::BookmarkNode;
24 using bookmarks_helper::AddFolder; 24 using bookmarks_helper::AddFolder;
25 using bookmarks_helper::AddURL; 25 using bookmarks_helper::AddURL;
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 ASSERT_EQ(0, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); 416 ASSERT_EQ(0, CountFoldersWithTitlesMatching(kSingleProfileIndex, title));
417 417
418 ASSERT_TRUE(SetupSync()); 418 ASSERT_TRUE(SetupSync());
419 419
420 ASSERT_EQ(1, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); 420 ASSERT_EQ(1, CountFoldersWithTitlesMatching(kSingleProfileIndex, title));
421 } 421 }
422 422
423 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) { 423 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, E2E_ONLY(SanitySetup)) {
424 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 424 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
425 } 425 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698