Index: chrome/browser/sync/test/integration/sessions_helper.h |
diff --git a/chrome/browser/sync/test/integration/sessions_helper.h b/chrome/browser/sync/test/integration/sessions_helper.h |
index b1078b496bef734417409ef029191a7ce431fd6e..5ea17fcccb12f469d3a5a05b844c9808f11b2e45 100644 |
--- a/chrome/browser/sync/test/integration/sessions_helper.h |
+++ b/chrome/browser/sync/test/integration/sessions_helper.h |
@@ -87,6 +87,17 @@ bool OpenTab(int index, const GURL& url); |
// size 1, the new tab will be in position 1. |
bool OpenTabAtIndex(int index, int tab_index, const GURL& url); |
+// Opens |url| from the WebContents at |index_of_source_tab| using |
+// |disposition|. |
+bool OpenTabFromSourceIndex(int index, |
+ int index_of_source_tab, |
+ const GURL& url, |
+ WindowOpenDisposition disposition); |
+ |
+// Open multiple tabs and block until the session model associator is aware |
+// of all of them. Returns true on success, false on failure. |
+bool OpenMultipleTabs(int index, const std::vector<GURL>& urls); |
+ |
// Moves the tab in position |tab_index| in the TabStrip for browser at |
// |from_index| to the TabStrip for browser at |to_index|. |
void MoveTab(int from_index, int to_index, int tab_index); |
@@ -107,12 +118,14 @@ void NavigateTabBack(int index); |
// one; if this isn't possible, does nothing |
void NavigateTabForward(int index); |
-// Open multiple tabs and block until the session model associator is aware |
-// of all of them. Returns true on success, false on failure. |
-bool OpenMultipleTabs(int index, const std::vector<GURL>& urls); |
+// Wait for a session change to propagate to the model associator. Will return |
Nicolas Zea
2017/03/16 19:57:44
nit: s/model associator/syncableservice, here and
Patrick Noland
2017/03/17 00:20:10
Done.
|
+// true once |url| has been found, or false if it times out while waiting. |
+bool WaitForTabToLoad(int index, |
+ const GURL& url, |
+ content::WebContents* WebContents); |
-// Wait for a session change to propagate to the model associator. Will not |
-// return until each url in |urls| has been found. |
+// Wait for each url in |urls| to load. The ordering of |urls| is assumed to |
+// match the ordering of the corresponding tabs. |
bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls); |
// Check if the session model associator's knows that the current open tab |