| OLD | NEW |
| 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 "base/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
| 6 #include "chrome/browser/profiles/profile.h" | 6 #include "chrome/browser/profiles/profile.h" |
| 7 #include "chrome/browser/sync/profile_sync_service.h" | |
| 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 9 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" | 8 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" |
| 10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
| 11 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 12 #include "components/bookmarks/browser/bookmark_model.h" | 11 #include "components/bookmarks/browser/bookmark_model.h" |
| 12 #include "components/browser_sync/browser/profile_sync_service.h" |
| 13 #include "sync/test/fake_server/bookmark_entity_builder.h" | 13 #include "sync/test/fake_server/bookmark_entity_builder.h" |
| 14 #include "sync/test/fake_server/entity_builder_factory.h" | 14 #include "sync/test/fake_server/entity_builder_factory.h" |
| 15 #include "sync/test/fake_server/fake_server_verifier.h" | 15 #include "sync/test/fake_server/fake_server_verifier.h" |
| 16 #include "sync/test/fake_server/tombstone_entity.h" | 16 #include "sync/test/fake_server/tombstone_entity.h" |
| 17 #include "ui/base/layout.h" | 17 #include "ui/base/layout.h" |
| 18 | 18 |
| 19 using bookmarks::BookmarkModel; | 19 using bookmarks::BookmarkModel; |
| 20 using bookmarks::BookmarkNode; | 20 using bookmarks::BookmarkNode; |
| 21 using bookmarks_helper::AddFolder; | 21 using bookmarks_helper::AddFolder; |
| 22 using bookmarks_helper::AddURL; | 22 using bookmarks_helper::AddURL; |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 fake_server_->InjectEntity(bookmark_builder.BuildFolder()); | 409 fake_server_->InjectEntity(bookmark_builder.BuildFolder()); |
| 410 | 410 |
| 411 DisableVerifier(); | 411 DisableVerifier(); |
| 412 ASSERT_TRUE(SetupClients()); | 412 ASSERT_TRUE(SetupClients()); |
| 413 ASSERT_EQ(0, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); | 413 ASSERT_EQ(0, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); |
| 414 | 414 |
| 415 ASSERT_TRUE(SetupSync()); | 415 ASSERT_TRUE(SetupSync()); |
| 416 | 416 |
| 417 ASSERT_EQ(1, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); | 417 ASSERT_EQ(1, CountFoldersWithTitlesMatching(kSingleProfileIndex, title)); |
| 418 } | 418 } |
| OLD | NEW |