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

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

Issue 253753005: Move bookmarks' production code to components/bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@367656
Patch Set: Fix compilation for win_chromium_x64_rel 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/bookmarks/bookmark_model.h"
7 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/sync/profile_sync_service.h" 7 #include "chrome/browser/sync/profile_sync_service.h"
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.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"
11 #include "components/bookmarks/core/browser/bookmark_model.h"
12 #include "components/bookmarks/core/browser/bookmark_service.h" 12 #include "components/bookmarks/core/browser/bookmark_service.h"
13 #include "sync/test/fake_server/fake_server_verifier.h" 13 #include "sync/test/fake_server/fake_server_verifier.h"
14 #include "ui/base/layout.h" 14 #include "ui/base/layout.h"
15 15
16 using bookmarks_helper::AddFolder; 16 using bookmarks_helper::AddFolder;
17 using bookmarks_helper::AddURL; 17 using bookmarks_helper::AddURL;
18 using bookmarks_helper::Create1xFaviconFromPNGFile; 18 using bookmarks_helper::Create1xFaviconFromPNGFile;
19 using bookmarks_helper::GetBookmarkBarNode; 19 using bookmarks_helper::GetBookmarkBarNode;
20 using bookmarks_helper::GetBookmarkModel; 20 using bookmarks_helper::GetBookmarkModel;
21 using bookmarks_helper::GetOtherNode; 21 using bookmarks_helper::GetOtherNode;
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 268
269 // Remove all bookmarks and wait for sync completion. 269 // Remove all bookmarks and wait for sync completion.
270 RemoveAll(0); 270 RemoveAll(0);
271 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 271 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
272 // Verify other node has no children now. 272 // Verify other node has no children now.
273 EXPECT_EQ(0, GetOtherNode(0)->child_count()); 273 EXPECT_EQ(0, GetOtherNode(0)->child_count());
274 EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count()); 274 EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count());
275 // Verify model matches verifier. 275 // Verify model matches verifier.
276 ASSERT_TRUE(ModelMatchesVerifier(0)); 276 ASSERT_TRUE(ModelMatchesVerifier(0));
277 } 277 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698