OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 package org.chromium.chrome.browser.sync; | 5 package org.chromium.chrome.browser.sync; |
6 | 6 |
7 import android.test.suitebuilder.annotation.LargeTest; | 7 import android.test.suitebuilder.annotation.LargeTest; |
8 import android.util.Pair; | 8 import android.util.Pair; |
9 | 9 |
10 import org.chromium.base.ThreadUtils; | 10 import org.chromium.base.ThreadUtils; |
11 import org.chromium.base.test.util.Feature; | 11 import org.chromium.base.test.util.Feature; |
12 import org.chromium.chrome.browser.bookmarks.BookmarkBridge; | 12 import org.chromium.chrome.browser.bookmarks.BookmarkBridge; |
13 import org.chromium.chrome.browser.profiles.Profile; | 13 import org.chromium.chrome.browser.profiles.Profile; |
14 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; | 14 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; |
15 import org.chromium.components.bookmarks.BookmarkId; | 15 import org.chromium.components.bookmarks.BookmarkId; |
| 16 import org.chromium.components.sync.ModelType; |
| 17 import org.chromium.components.sync.protocol.BookmarkSpecifics; |
| 18 import org.chromium.components.sync.protocol.SyncEntity; |
16 import org.chromium.content.browser.test.util.Criteria; | 19 import org.chromium.content.browser.test.util.Criteria; |
17 import org.chromium.sync.ModelType; | |
18 import org.chromium.sync.protocol.BookmarkSpecifics; | |
19 import org.chromium.sync.protocol.SyncEntity; | |
20 import org.json.JSONException; | 20 import org.json.JSONException; |
21 import org.json.JSONObject; | 21 import org.json.JSONObject; |
22 | 22 |
23 import java.util.ArrayList; | 23 import java.util.ArrayList; |
24 import java.util.List; | 24 import java.util.List; |
25 import java.util.concurrent.Callable; | 25 import java.util.concurrent.Callable; |
26 | 26 |
27 /** | 27 /** |
28 * Test suite for the bookmarks sync data type. | 28 * Test suite for the bookmarks sync data type. |
29 */ | 29 */ |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 try { | 488 try { |
489 return mFakeServerHelper.verifyEntityCountByTypeAndName( | 489 return mFakeServerHelper.verifyEntityCountByTypeAndName( |
490 count, ModelType.BOOKMARKS, name); | 490 count, ModelType.BOOKMARKS, name); |
491 } catch (Exception e) { | 491 } catch (Exception e) { |
492 throw new RuntimeException(e); | 492 throw new RuntimeException(e); |
493 } | 493 } |
494 } | 494 } |
495 }); | 495 }); |
496 } | 496 } |
497 } | 497 } |
OLD | NEW |