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.base.test.util.FlakyTest; | 12 import org.chromium.base.test.util.FlakyTest; |
13 import org.chromium.chrome.browser.ChromeApplication; | 13 import org.chromium.chrome.browser.ChromeApplication; |
14 import org.chromium.chrome.browser.tabmodel.TabModelSelector; | 14 import org.chromium.chrome.browser.tabmodel.TabModelSelector; |
15 import org.chromium.chrome.browser.tabmodel.TabModelUtils; | 15 import org.chromium.chrome.browser.tabmodel.TabModelUtils; |
16 import org.chromium.chrome.browser.util.FeatureUtilities; | 16 import org.chromium.chrome.browser.util.FeatureUtilities; |
17 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; | 17 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; |
| 18 import org.chromium.components.sync.protocol.EntitySpecifics; |
| 19 import org.chromium.components.sync.protocol.SessionHeader; |
| 20 import org.chromium.components.sync.protocol.SessionSpecifics; |
| 21 import org.chromium.components.sync.protocol.SessionTab; |
| 22 import org.chromium.components.sync.protocol.SessionWindow; |
| 23 import org.chromium.components.sync.protocol.SyncEnums; |
| 24 import org.chromium.components.sync.protocol.TabNavigation; |
18 import org.chromium.content.browser.test.util.Criteria; | 25 import org.chromium.content.browser.test.util.Criteria; |
19 import org.chromium.sync.protocol.EntitySpecifics; | |
20 import org.chromium.sync.protocol.SessionHeader; | |
21 import org.chromium.sync.protocol.SessionSpecifics; | |
22 import org.chromium.sync.protocol.SessionTab; | |
23 import org.chromium.sync.protocol.SessionWindow; | |
24 import org.chromium.sync.protocol.SyncEnums; | |
25 import org.chromium.sync.protocol.TabNavigation; | |
26 import org.json.JSONArray; | 26 import org.json.JSONArray; |
27 import org.json.JSONException; | 27 import org.json.JSONException; |
28 import org.json.JSONObject; | 28 import org.json.JSONObject; |
29 | 29 |
30 import java.util.ArrayList; | 30 import java.util.ArrayList; |
31 import java.util.Arrays; | 31 import java.util.Arrays; |
32 import java.util.HashMap; | 32 import java.util.HashMap; |
33 import java.util.List; | 33 import java.util.List; |
34 import java.util.Map; | 34 import java.util.Map; |
35 import java.util.concurrent.Callable; | 35 import java.util.concurrent.Callable; |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 int i = tab.getInt("current_navigation_index"); | 357 int i = tab.getInt("current_navigation_index"); |
358 String tabId = tab.getString("tab_id"); | 358 String tabId = tab.getString("tab_id"); |
359 String url = tab.getJSONArray("navigation") | 359 String url = tab.getJSONArray("navigation") |
360 .getJSONObject(i).getString("virtual_url"); | 360 .getJSONObject(i).getString("virtual_url"); |
361 tabIdsToUrls.put(tabId, url); | 361 tabIdsToUrls.put(tabId, url); |
362 tabIdsToEntityIds.put(tabId, tabEntity.first); | 362 tabIdsToEntityIds.put(tabId, tabEntity.first); |
363 } | 363 } |
364 } | 364 } |
365 } | 365 } |
366 } | 366 } |
OLD | NEW |