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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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 "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" 7 #include "chrome/browser/sync/profile_sync_service.h"
8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
10 #include "chrome/browser/sync/test/integration/sync_test.h" 10 #include "chrome/browser/sync/test/integration/sync_test.h"
11 #include "components/bookmarks/core/browser/bookmark_model.h" 11 #include "components/bookmarks/browser/bookmark_model.h"
12 #include "components/bookmarks/core/browser/bookmark_service.h" 12 #include "components/bookmarks/browser/bookmark_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 "ui/base/layout.h" 16 #include "ui/base/layout.h"
17 17
18 using bookmarks_helper::AddFolder; 18 using bookmarks_helper::AddFolder;
19 using bookmarks_helper::AddURL; 19 using bookmarks_helper::AddURL;
20 using bookmarks_helper::CountBookmarksWithTitlesMatching; 20 using bookmarks_helper::CountBookmarksWithTitlesMatching;
21 using bookmarks_helper::Create1xFaviconFromPNGFile; 21 using bookmarks_helper::Create1xFaviconFromPNGFile;
22 using bookmarks_helper::GetBookmarkBarNode; 22 using bookmarks_helper::GetBookmarkBarNode;
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 // Remove all bookmarks and wait for sync completion. 287 // Remove all bookmarks and wait for sync completion.
288 RemoveAll(0); 288 RemoveAll(0);
289 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 289 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
290 // Verify other node has no children now. 290 // Verify other node has no children now.
291 EXPECT_EQ(0, GetOtherNode(0)->child_count()); 291 EXPECT_EQ(0, GetOtherNode(0)->child_count());
292 EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count()); 292 EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count());
293 // Verify model matches verifier. 293 // Verify model matches verifier.
294 ASSERT_TRUE(ModelMatchesVerifier(0)); 294 ASSERT_TRUE(ModelMatchesVerifier(0));
295 } 295 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/bookmarks_helper.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698