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

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 10828268: [Sync] Fix mobile bookmark folder association on non-android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index d25ab6c328d5444831ecb771cb263af411f281a2..d16b5c5905b361a47b81f32cceb5615c11212311 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -51,6 +51,12 @@ using testing::InvokeWithoutArgs;
using testing::Mock;
using testing::StrictMock;
+#if defined(OS_ANDROID)
+static const bool kExpectMobileBookmarks = true;
+#else
+static const bool kExpectMobileBookmarks = false;
+#endif // defined(OS_ANDROID)
+
class TestBookmarkModelAssociator : public BookmarkModelAssociator {
public:
TestBookmarkModelAssociator(
@@ -59,7 +65,7 @@ class TestBookmarkModelAssociator : public BookmarkModelAssociator {
DataTypeErrorHandler* error_handler)
: BookmarkModelAssociator(bookmark_model, user_share,
error_handler,
- true /* expect_mobile_bookmarks_folder */),
+ kExpectMobileBookmarks),
user_share_(user_share) {}
// TODO(akalin): This logic lazily creates any tagged node that is
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698