Sessions sync integration tests: check all windows and tabs when searching for a URL.

chrome/test/live_sync/live_sessions_sync_test.cc

Index: chrome/test/live_sync/live_sessions_sync_test.cc
diff --git a/chrome/test/live_sync/live_sessions_sync_test.cc b/chrome/test/live_sync/live_sessions_sync_test.cc
index abc8f1682290123b576a7dcaf6b1f822f77c6a6b..e0e98d9e5d031dd78d5a318fca37592131f670db 100644
--- a/chrome/test/live_sync/live_sessions_sync_test.cc
+++ b/chrome/test/live_sync/live_sessions_sync_test.cc
@@ -38,35 +38,56 @@ bool LiveSessionsSyncTest::SetupClients() {
   return true;
 }
 
+bool LiveSessionsSyncTest::GetLocalSession(int index,
+                                           const SyncedSession** session) {
+  if (!GetProfile(index)->GetProfileSyncService()->

[Nicolas Zea, 2011/08/04 00:28:49]

return GetProfile(index)->...

[braffert, 2011/08/04 00:38:36]

Done.

+          GetSessionModelAssociator()->GetLocalSession(session)) {
+    return false;
+  }
+  return true;
+}
+
 bool LiveSessionsSyncTest::ModelAssociatorHasTabWithUrl(int index,
                                                         const GURL& url) {
   ui_test_utils::RunAllPendingInMessageLoop();
   const SyncedSession* local_session;
-  if (!GetProfile(index)->GetProfileSyncService()->
-          GetSessionModelAssociator()->GetLocalSession(&local_session)) {
-    return false;
-  }
-  if (local_session->windows.size() == 0 ||
-      local_session->windows[0]->tabs.size() == 0 ||
-      local_session->windows[0]->tabs[0]->navigations.size() == 0) {
-    VLOG(1) << "Bad vectors!";
+  if (!GetLocalSession(index, &local_session)) {
     return false;
   }
 
-  int nav_index =
-      local_session->windows[0]->tabs[0]->current_navigation_index;
-  TabNavigation nav =
-      local_session->windows[0]->tabs[0]->navigations[nav_index];
-  if (nav.virtual_url() != url) {
-    VLOG(1) << "Bad url!";
+  if (local_session->windows.size() == 0) {
+    VLOG(1) << "Empty windows vector";
     return false;
   }
-  if (nav.title().empty()) {
-    VLOG(1) << "No title!";
-    return false;
+
+  int nav_index;
+  TabNavigation nav;
+  for (std::vector<SessionWindow*>::const_iterator it =
+           local_session->windows.begin(); it != local_session->windows.end();
+           ++it) {
+    if ((*it)->tabs.size() == 0) {
+      VLOG(1) << "Empty tabs vector";
+      return false;

[Nicolas Zea, 2011/08/04 00:28:49]

change to continue;

+    }
+    for (std::vector<SessionTab*>::const_iterator tab_it =
+             (*it)->tabs.begin(); tab_it != (*it)->tabs.end(); ++tab_it) {
+      if ((*tab_it)->navigations.size() == 0) {
+        VLOG(1) << "Empty navigations vector";

[Nicolas Zea, 2011/08/04 00:28:49]

continue;

+      }
+      nav_index = (*tab_it)->current_navigation_index;
+      nav = (*tab_it)->navigations[nav_index];
+      if (nav.virtual_url() == url) {
+        VLOG(1) << "Found tab with url " << url.spec();
+        if (nav.title().empty()) {
+          VLOG(1) << "No title!";
+          return false;

[Nicolas Zea, 2011/08/04 00:28:49]

change to continue;

[braffert, 2011/08/04 00:38:36]

Done for all 3.  I was trying to replicate the original function, which would
immediately return false if an empty vector was seen, but now I see why continue
is more appropriate here.

+        }
+        return true;
+      }
+    }
   }
-  VLOG(1) << "Found tab with url " << url.spec();
-  return true;
+  VLOG(1) << "Could not find tab with url " << url.spec();
+  return false;
 }
 
 bool LiveSessionsSyncTest::OpenTab(int index, const GURL& url) {
@@ -97,8 +118,7 @@ std::vector<SessionWindow*>* LiveSessionsSyncTest::GetLocalWindows(int index) {
   // The local session provided by GetLocalSession is owned, and has lifetime
   // controlled, by the model associator, so we must make our own copy.
   const SyncedSession* local_session;
-  if (!GetProfile(index)->GetProfileSyncService()->GetSessionModelAssociator()->
-          GetLocalSession(&local_session)) {
+  if (!GetLocalSession(index, &local_session)) {
     return NULL;
   }
   scoped_ptr<SyncedSession> session_copy(new SyncedSession());
@@ -142,8 +162,7 @@ bool LiveSessionsSyncTest::CheckInitialState(int index) {
 
 int LiveSessionsSyncTest::GetNumWindows(int index) {
   const SyncedSession* local_session;
-  if (!GetProfile(index)->GetProfileSyncService()->GetSessionModelAssociator()->
-          GetLocalSession(&local_session)) {
+  if (!GetLocalSession(index, &local_session)) {
     return 0;
   }
   return local_session->windows.size();