Index: chrome/browser/sync/glue/synced_session_tracker_unittest.cc |
diff --git a/chrome/browser/sync/glue/synced_session_tracker_unittest.cc b/chrome/browser/sync/glue/synced_session_tracker_unittest.cc |
index 2dbb65bdec379cc5f8d4f33ccd2c7ed8df6af3e2..1a50bcc6d8a27ad3150bd3f0ce9e85de95bc2401 100644 |
--- a/chrome/browser/sync/glue/synced_session_tracker_unittest.cc |
+++ b/chrome/browser/sync/glue/synced_session_tracker_unittest.cc |
@@ -12,77 +12,98 @@ |
#include "chrome/browser/sync/glue/synced_session_tracker.h" |
#include "components/sessions/core/serialized_navigation_entry_test_helper.h" |
#include "components/sessions/core/session_types.h" |
+#include "components/sync_sessions/fake_sync_sessions_client.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace browser_sync { |
-typedef testing::Test SyncedSessionTrackerTest; |
+namespace { |
+ |
+const std::string kValidUrl = "http://www.example.com"; |
+const std::string kInvalidUrl = "invalid.url"; |
+ |
+} // namespace |
+ |
+class SyncedSessionTrackerTest : public testing::Test { |
+ public: |
+ SyncedSessionTrackerTest() : tracker_(&sessions_client_) {} |
+ ~SyncedSessionTrackerTest() override {} |
+ |
+ SyncedSessionTracker* GetTracker() { return &tracker_; } |
+ |
+ private: |
+ sync_sessions::FakeSyncSessionsClient sessions_client_; |
+ SyncedSessionTracker tracker_; |
+}; |
TEST_F(SyncedSessionTrackerTest, GetSession) { |
- SyncedSessionTracker tracker; |
- sync_driver::SyncedSession* session1 = tracker.GetSession("tag"); |
- sync_driver::SyncedSession* session2 = tracker.GetSession("tag2"); |
- ASSERT_EQ(session1, tracker.GetSession("tag")); |
+ sync_driver::SyncedSession* session1 = GetTracker()->GetSession("tag"); |
+ sync_driver::SyncedSession* session2 = GetTracker()->GetSession("tag2"); |
+ ASSERT_EQ(session1, GetTracker()->GetSession("tag")); |
ASSERT_NE(session1, session2); |
// Should clean up memory on its own. |
} |
TEST_F(SyncedSessionTrackerTest, GetTabUnmapped) { |
- SyncedSessionTracker tracker; |
- sessions::SessionTab* tab = tracker.GetTab("tag", 0, 0); |
- ASSERT_EQ(tab, tracker.GetTab("tag", 0, 0)); |
+ sessions::SessionTab* tab = GetTracker()->GetTab("tag", 0, 0); |
+ ASSERT_EQ(tab, GetTracker()->GetTab("tag", 0, 0)); |
// Should clean up memory on its own. |
} |
TEST_F(SyncedSessionTrackerTest, PutWindowInSession) { |
- SyncedSessionTracker tracker; |
- tracker.PutWindowInSession("tag", 0); |
- sync_driver::SyncedSession* session = tracker.GetSession("tag"); |
+ GetTracker()->PutWindowInSession("tag", 0); |
+ sync_driver::SyncedSession* session = GetTracker()->GetSession("tag"); |
ASSERT_EQ(1U, session->windows.size()); |
// Should clean up memory on its own. |
} |
TEST_F(SyncedSessionTrackerTest, PutTabInWindow) { |
- SyncedSessionTracker tracker; |
- tracker.PutWindowInSession("tag", 10); |
- tracker.PutTabInWindow("tag", 10, 15, 0); // win id 10, tab id 15, tab ind 0. |
- sync_driver::SyncedSession* session = tracker.GetSession("tag"); |
+ GetTracker()->PutWindowInSession("tag", 10); |
+ GetTracker()->PutTabInWindow("tag", 10, 15, |
+ 0); // win id 10, tab id 15, tab ind 0. |
+ sync_driver::SyncedSession* session = GetTracker()->GetSession("tag"); |
ASSERT_EQ(1U, session->windows.size()); |
ASSERT_EQ(1U, session->windows[10]->tabs.size()); |
- ASSERT_EQ(tracker.GetTab("tag", 15, 1), session->windows[10]->tabs[0]); |
+ ASSERT_EQ(GetTracker()->GetTab("tag", 15, 1), session->windows[10]->tabs[0]); |
// Should clean up memory on its own. |
} |
TEST_F(SyncedSessionTrackerTest, LookupAllForeignSessions) { |
- SyncedSessionTracker tracker; |
std::vector<const sync_driver::SyncedSession*> sessions; |
- ASSERT_FALSE(tracker.LookupAllForeignSessions(&sessions)); |
- tracker.GetSession("tag1"); |
- tracker.GetSession("tag2"); |
- tracker.PutWindowInSession("tag1", 0); |
- tracker.PutTabInWindow("tag1", 0, 15, 0); |
- sessions::SessionTab* tab = tracker.GetTab("tag1", 15, 1); |
+ ASSERT_FALSE(GetTracker()->LookupAllForeignSessions(&sessions)); |
+ GetTracker()->GetSession("tag1"); |
+ GetTracker()->PutWindowInSession("tag1", 0); |
+ GetTracker()->PutTabInWindow("tag1", 0, 15, 0); |
+ sessions::SessionTab* tab = GetTracker()->GetTab("tag1", 15, 1); |
+ ASSERT_TRUE(tab); |
+ tab->navigations.push_back( |
+ sessions::SerializedNavigationEntryTestHelper::CreateNavigation(kValidUrl, |
+ "title")); |
+ GetTracker()->GetSession("tag2"); |
+ GetTracker()->GetSession("tag3"); |
+ GetTracker()->PutWindowInSession("tag3", 0); |
+ GetTracker()->PutTabInWindow("tag3", 0, 15, 0); |
+ tab = GetTracker()->GetTab("tag3", 15, 1); |
ASSERT_TRUE(tab); |
tab->navigations.push_back( |
sessions::SerializedNavigationEntryTestHelper::CreateNavigation( |
- "bla://valid_url", "title")); |
- ASSERT_TRUE(tracker.LookupAllForeignSessions(&sessions)); |
+ kInvalidUrl, "title")); |
+ ASSERT_TRUE(GetTracker()->LookupAllForeignSessions(&sessions)); |
// Only the session with a valid window and tab gets returned. |
ASSERT_EQ(1U, sessions.size()); |
ASSERT_EQ("tag1", sessions[0]->session_tag); |
} |
TEST_F(SyncedSessionTrackerTest, LookupSessionWindows) { |
- SyncedSessionTracker tracker; |
std::vector<const sessions::SessionWindow*> windows; |
- ASSERT_FALSE(tracker.LookupSessionWindows("tag1", &windows)); |
- tracker.GetSession("tag1"); |
- tracker.PutWindowInSession("tag1", 0); |
- tracker.PutWindowInSession("tag1", 2); |
- tracker.GetSession("tag2"); |
- tracker.PutWindowInSession("tag2", 0); |
- tracker.PutWindowInSession("tag2", 2); |
- ASSERT_TRUE(tracker.LookupSessionWindows("tag1", &windows)); |
+ ASSERT_FALSE(GetTracker()->LookupSessionWindows("tag1", &windows)); |
+ GetTracker()->GetSession("tag1"); |
+ GetTracker()->PutWindowInSession("tag1", 0); |
+ GetTracker()->PutWindowInSession("tag1", 2); |
+ GetTracker()->GetSession("tag2"); |
+ GetTracker()->PutWindowInSession("tag2", 0); |
+ GetTracker()->PutWindowInSession("tag2", 2); |
+ ASSERT_TRUE(GetTracker()->LookupSessionWindows("tag1", &windows)); |
ASSERT_EQ(2U, windows.size()); // Only windows from tag1 session. |
ASSERT_NE((sessions::SessionWindow*)nullptr, windows[0]); |
ASSERT_NE((sessions::SessionWindow*)nullptr, windows[1]); |
@@ -90,13 +111,12 @@ TEST_F(SyncedSessionTrackerTest, LookupSessionWindows) { |
} |
TEST_F(SyncedSessionTrackerTest, LookupSessionTab) { |
- SyncedSessionTracker tracker; |
const sessions::SessionTab* tab; |
- ASSERT_FALSE(tracker.LookupSessionTab("tag1", 5, &tab)); |
- tracker.GetSession("tag1"); |
- tracker.PutWindowInSession("tag1", 0); |
- tracker.PutTabInWindow("tag1", 0, 5, 0); |
- ASSERT_TRUE(tracker.LookupSessionTab("tag1", 5, &tab)); |
+ ASSERT_FALSE(GetTracker()->LookupSessionTab("tag1", 5, &tab)); |
+ GetTracker()->GetSession("tag1"); |
+ GetTracker()->PutWindowInSession("tag1", 0); |
+ GetTracker()->PutTabInWindow("tag1", 0, 5, 0); |
+ ASSERT_TRUE(GetTracker()->LookupSessionTab("tag1", 5, &tab)); |
ASSERT_NE((sessions::SessionTab*)nullptr, tab); |
} |
@@ -104,70 +124,68 @@ TEST_F(SyncedSessionTrackerTest, Complex) { |
const std::string tag1 = "tag"; |
const std::string tag2 = "tag2"; |
const std::string tag3 = "tag3"; |
- SyncedSessionTracker tracker; |
std::vector<sessions::SessionTab*> tabs1, tabs2; |
sessions::SessionTab* temp_tab; |
- ASSERT_TRUE(tracker.Empty()); |
- ASSERT_EQ(0U, tracker.num_synced_sessions()); |
- ASSERT_EQ(0U, tracker.num_synced_tabs(tag1)); |
- tabs1.push_back(tracker.GetTab(tag1, 0, 0)); |
- tabs1.push_back(tracker.GetTab(tag1, 1, 1)); |
- tabs1.push_back(tracker.GetTab(tag1, 2, 2)); |
- ASSERT_EQ(3U, tracker.num_synced_tabs(tag1)); |
- ASSERT_EQ(0U, tracker.num_synced_sessions()); |
- temp_tab = tracker.GetTab(tag1, 0, 0); // Already created. |
- ASSERT_EQ(3U, tracker.num_synced_tabs(tag1)); |
- ASSERT_EQ(0U, tracker.num_synced_sessions()); |
+ ASSERT_TRUE(GetTracker()->Empty()); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_sessions()); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_tabs(tag1)); |
+ tabs1.push_back(GetTracker()->GetTab(tag1, 0, 0)); |
+ tabs1.push_back(GetTracker()->GetTab(tag1, 1, 1)); |
+ tabs1.push_back(GetTracker()->GetTab(tag1, 2, 2)); |
+ ASSERT_EQ(3U, GetTracker()->num_synced_tabs(tag1)); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_sessions()); |
+ temp_tab = GetTracker()->GetTab(tag1, 0, 0); // Already created. |
+ ASSERT_EQ(3U, GetTracker()->num_synced_tabs(tag1)); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_sessions()); |
ASSERT_EQ(tabs1[0], temp_tab); |
- tabs2.push_back(tracker.GetTab(tag2, 0, 0)); |
- ASSERT_EQ(1U, tracker.num_synced_tabs(tag2)); |
- ASSERT_EQ(0U, tracker.num_synced_sessions()); |
- ASSERT_FALSE(tracker.DeleteSession(tag3)); |
+ tabs2.push_back(GetTracker()->GetTab(tag2, 0, 0)); |
+ ASSERT_EQ(1U, GetTracker()->num_synced_tabs(tag2)); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_sessions()); |
+ ASSERT_FALSE(GetTracker()->DeleteSession(tag3)); |
- sync_driver::SyncedSession* session = tracker.GetSession(tag1); |
- sync_driver::SyncedSession* session2 = tracker.GetSession(tag2); |
- sync_driver::SyncedSession* session3 = tracker.GetSession(tag3); |
- ASSERT_EQ(3U, tracker.num_synced_sessions()); |
+ sync_driver::SyncedSession* session = GetTracker()->GetSession(tag1); |
+ sync_driver::SyncedSession* session2 = GetTracker()->GetSession(tag2); |
+ sync_driver::SyncedSession* session3 = GetTracker()->GetSession(tag3); |
+ ASSERT_EQ(3U, GetTracker()->num_synced_sessions()); |
ASSERT_TRUE(session); |
ASSERT_TRUE(session2); |
ASSERT_TRUE(session3); |
ASSERT_NE(session, session2); |
ASSERT_NE(session2, session3); |
- ASSERT_TRUE(tracker.DeleteSession(tag3)); |
- ASSERT_EQ(2U, tracker.num_synced_sessions()); |
+ ASSERT_TRUE(GetTracker()->DeleteSession(tag3)); |
+ ASSERT_EQ(2U, GetTracker()->num_synced_sessions()); |
- tracker.PutWindowInSession(tag1, 0); // Create a window. |
- tracker.PutTabInWindow(tag1, 0, 2, 0); // No longer unmapped. |
- ASSERT_EQ(3U, tracker.num_synced_tabs(tag1)); // Has not changed. |
+ GetTracker()->PutWindowInSession(tag1, 0); // Create a window. |
+ GetTracker()->PutTabInWindow(tag1, 0, 2, 0); // No longer unmapped. |
+ ASSERT_EQ(3U, GetTracker()->num_synced_tabs(tag1)); // Has not changed. |
const sessions::SessionTab *tab_ptr; |
- ASSERT_TRUE(tracker.LookupSessionTab(tag1, 0, &tab_ptr)); |
+ ASSERT_TRUE(GetTracker()->LookupSessionTab(tag1, 0, &tab_ptr)); |
ASSERT_EQ(tab_ptr, tabs1[0]); |
- ASSERT_TRUE(tracker.LookupSessionTab(tag1, 2, &tab_ptr)); |
+ ASSERT_TRUE(GetTracker()->LookupSessionTab(tag1, 2, &tab_ptr)); |
ASSERT_EQ(tab_ptr, tabs1[2]); |
- ASSERT_FALSE(tracker.LookupSessionTab(tag1, 3, &tab_ptr)); |
+ ASSERT_FALSE(GetTracker()->LookupSessionTab(tag1, 3, &tab_ptr)); |
ASSERT_EQ(static_cast<const sessions::SessionTab*>(NULL), tab_ptr); |
std::vector<const sessions::SessionWindow*> windows; |
- ASSERT_TRUE(tracker.LookupSessionWindows(tag1, &windows)); |
+ ASSERT_TRUE(GetTracker()->LookupSessionWindows(tag1, &windows)); |
ASSERT_EQ(1U, windows.size()); |
- ASSERT_TRUE(tracker.LookupSessionWindows(tag2, &windows)); |
+ ASSERT_TRUE(GetTracker()->LookupSessionWindows(tag2, &windows)); |
ASSERT_EQ(0U, windows.size()); |
// The sessions don't have valid tabs, lookup should not succeed. |
std::vector<const sync_driver::SyncedSession*> sessions; |
- ASSERT_FALSE(tracker.LookupAllForeignSessions(&sessions)); |
+ ASSERT_FALSE(GetTracker()->LookupAllForeignSessions(&sessions)); |
- tracker.Clear(); |
- ASSERT_EQ(0U, tracker.num_synced_tabs(tag1)); |
- ASSERT_EQ(0U, tracker.num_synced_tabs(tag2)); |
- ASSERT_EQ(0U, tracker.num_synced_sessions()); |
+ GetTracker()->Clear(); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_tabs(tag1)); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_tabs(tag2)); |
+ ASSERT_EQ(0U, GetTracker()->num_synced_sessions()); |
} |
TEST_F(SyncedSessionTrackerTest, ManyGetTabs) { |
- SyncedSessionTracker tracker; |
- ASSERT_TRUE(tracker.Empty()); |
+ ASSERT_TRUE(GetTracker()->Empty()); |
const int kMaxSessions = 10; |
const int kMaxTabs = 1000; |
const int kMaxAttempts = 10000; |
@@ -178,94 +196,92 @@ TEST_F(SyncedSessionTrackerTest, ManyGetTabs) { |
// sometimes have to allocate new tabs. |
int rand_tab_num = base::RandInt(0, kMaxTabs); |
sessions::SessionTab* tab = |
- tracker.GetTab(tag, rand_tab_num, rand_tab_num + 1); |
+ GetTracker()->GetTab(tag, rand_tab_num, rand_tab_num + 1); |
ASSERT_TRUE(tab); |
} |
} |
} |
TEST_F(SyncedSessionTrackerTest, LookupTabNodeIds) { |
- SyncedSessionTracker tracker; |
std::set<int> result; |
std::string tag1 = "session1"; |
std::string tag2 = "session2"; |
std::string tag3 = "session3"; |
- tracker.GetTab(tag1, 1, 1); |
- tracker.GetTab(tag1, 2, 2); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag1, &result)); |
+ GetTracker()->GetTab(tag1, 1, 1); |
+ GetTracker()->GetTab(tag1, 2, 2); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag1, &result)); |
EXPECT_EQ(2U, result.size()); |
EXPECT_FALSE(result.end() == result.find(1)); |
EXPECT_FALSE(result.end() == result.find(2)); |
- EXPECT_FALSE(tracker.LookupTabNodeIds(tag2, &result)); |
+ EXPECT_FALSE(GetTracker()->LookupTabNodeIds(tag2, &result)); |
- tracker.PutWindowInSession(tag1, 0); |
- tracker.PutTabInWindow(tag1, 0, 3, 0); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag1, &result)); |
+ GetTracker()->PutWindowInSession(tag1, 0); |
+ GetTracker()->PutTabInWindow(tag1, 0, 3, 0); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag1, &result)); |
EXPECT_EQ(2U, result.size()); |
- tracker.GetTab(tag1, 3, 3); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag1, &result)); |
+ GetTracker()->GetTab(tag1, 3, 3); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag1, &result)); |
EXPECT_EQ(3U, result.size()); |
EXPECT_FALSE(result.end() == result.find(3)); |
- tracker.GetTab(tag2, 1, 21); |
- tracker.GetTab(tag2, 2, 22); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag2, &result)); |
+ GetTracker()->GetTab(tag2, 1, 21); |
+ GetTracker()->GetTab(tag2, 2, 22); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag2, &result)); |
EXPECT_EQ(2U, result.size()); |
EXPECT_FALSE(result.end() == result.find(21)); |
EXPECT_FALSE(result.end() == result.find(22)); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag1, &result)); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag1, &result)); |
EXPECT_EQ(3U, result.size()); |
EXPECT_FALSE(result.end() == result.find(1)); |
EXPECT_FALSE(result.end() == result.find(2)); |
- EXPECT_FALSE(tracker.LookupTabNodeIds(tag3, &result)); |
- tracker.PutWindowInSession(tag3, 1); |
- tracker.PutTabInWindow(tag3, 1, 5, 0); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag3, &result)); |
+ EXPECT_FALSE(GetTracker()->LookupTabNodeIds(tag3, &result)); |
+ GetTracker()->PutWindowInSession(tag3, 1); |
+ GetTracker()->PutTabInWindow(tag3, 1, 5, 0); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag3, &result)); |
EXPECT_TRUE(result.empty()); |
- EXPECT_TRUE(tracker.DeleteSession(tag3)); |
- EXPECT_FALSE(tracker.LookupTabNodeIds(tag3, &result)); |
+ EXPECT_TRUE(GetTracker()->DeleteSession(tag3)); |
+ EXPECT_FALSE(GetTracker()->LookupTabNodeIds(tag3, &result)); |
- EXPECT_TRUE(tracker.DeleteSession(tag1)); |
- EXPECT_FALSE(tracker.LookupTabNodeIds(tag1, &result)); |
- EXPECT_TRUE(tracker.LookupTabNodeIds(tag2, &result)); |
+ EXPECT_TRUE(GetTracker()->DeleteSession(tag1)); |
+ EXPECT_FALSE(GetTracker()->LookupTabNodeIds(tag1, &result)); |
+ EXPECT_TRUE(GetTracker()->LookupTabNodeIds(tag2, &result)); |
EXPECT_EQ(2U, result.size()); |
EXPECT_FALSE(result.end() == result.find(21)); |
EXPECT_FALSE(result.end() == result.find(22)); |
- EXPECT_TRUE(tracker.DeleteSession(tag2)); |
- EXPECT_FALSE(tracker.LookupTabNodeIds(tag2, &result)); |
+ EXPECT_TRUE(GetTracker()->DeleteSession(tag2)); |
+ EXPECT_FALSE(GetTracker()->LookupTabNodeIds(tag2, &result)); |
} |
TEST_F(SyncedSessionTrackerTest, SessionTracking) { |
- SyncedSessionTracker tracker; |
- ASSERT_TRUE(tracker.Empty()); |
+ ASSERT_TRUE(GetTracker()->Empty()); |
std::string tag1 = "tag1"; |
std::string tag2 = "tag2"; |
// Create some session information that is stale. |
- sync_driver::SyncedSession* session1 = tracker.GetSession(tag1); |
- tracker.PutWindowInSession(tag1, 0); |
- tracker.PutTabInWindow(tag1, 0, 0, 0); |
- tracker.PutTabInWindow(tag1, 0, 1, 1); |
- tracker.GetTab(tag1, 2, 3U)->window_id.set_id(0); // Will be unmapped. |
- tracker.GetTab(tag1, 3, 4U)->window_id.set_id(0); // Will be unmapped. |
- tracker.PutWindowInSession(tag1, 1); |
- tracker.PutTabInWindow(tag1, 1, 4, 0); |
- tracker.PutTabInWindow(tag1, 1, 5, 1); |
+ sync_driver::SyncedSession* session1 = GetTracker()->GetSession(tag1); |
+ GetTracker()->PutWindowInSession(tag1, 0); |
+ GetTracker()->PutTabInWindow(tag1, 0, 0, 0); |
+ GetTracker()->PutTabInWindow(tag1, 0, 1, 1); |
+ GetTracker()->GetTab(tag1, 2, 3U)->window_id.set_id(0); // Will be unmapped. |
+ GetTracker()->GetTab(tag1, 3, 4U)->window_id.set_id(0); // Will be unmapped. |
+ GetTracker()->PutWindowInSession(tag1, 1); |
+ GetTracker()->PutTabInWindow(tag1, 1, 4, 0); |
+ GetTracker()->PutTabInWindow(tag1, 1, 5, 1); |
ASSERT_EQ(2U, session1->windows.size()); |
ASSERT_EQ(2U, session1->windows[0]->tabs.size()); |
ASSERT_EQ(2U, session1->windows[1]->tabs.size()); |
- ASSERT_EQ(6U, tracker.num_synced_tabs(tag1)); |
+ ASSERT_EQ(6U, GetTracker()->num_synced_tabs(tag1)); |
// Create a session that should not be affected. |
- sync_driver::SyncedSession* session2 = tracker.GetSession(tag2); |
- tracker.PutWindowInSession(tag2, 2); |
- tracker.PutTabInWindow(tag2, 2, 1, 0); |
+ sync_driver::SyncedSession* session2 = GetTracker()->GetSession(tag2); |
+ GetTracker()->PutWindowInSession(tag2, 2); |
+ GetTracker()->PutTabInWindow(tag2, 2, 1, 0); |
ASSERT_EQ(1U, session2->windows.size()); |
ASSERT_EQ(1U, session2->windows[2]->tabs.size()); |
- ASSERT_EQ(1U, tracker.num_synced_tabs(tag2)); |
+ ASSERT_EQ(1U, GetTracker()->num_synced_tabs(tag2)); |
// Reset tracking and get the current windows/tabs. |
// We simulate moving a tab from one window to another, then closing the |
@@ -273,27 +289,27 @@ TEST_F(SyncedSessionTrackerTest, SessionTracking) { |
// on the remaining window. |
// New tab, arrived before meta node so unmapped. |
- tracker.GetTab(tag1, 6, 7U); |
- tracker.ResetSessionTracking(tag1); |
- tracker.PutWindowInSession(tag1, 0); |
- tracker.PutTabInWindow(tag1, 0, 0, 0); |
+ GetTracker()->GetTab(tag1, 6, 7U); |
+ GetTracker()->ResetSessionTracking(tag1); |
+ GetTracker()->PutWindowInSession(tag1, 0); |
+ GetTracker()->PutTabInWindow(tag1, 0, 0, 0); |
// Tab 1 is closed. |
- tracker.PutTabInWindow(tag1, 0, 2, 1); // No longer unmapped. |
+ GetTracker()->PutTabInWindow(tag1, 0, 2, 1); // No longer unmapped. |
// Tab 3 was unmapped and does not get used. |
- tracker.PutTabInWindow(tag1, 0, 4, 2); // Moved from window 1. |
+ GetTracker()->PutTabInWindow(tag1, 0, 4, 2); // Moved from window 1. |
// Window 1 was closed, along with tab 5. |
- tracker.PutTabInWindow(tag1, 0, 6, 3); // No longer unmapped. |
+ GetTracker()->PutTabInWindow(tag1, 0, 6, 3); // No longer unmapped. |
// Session 2 should not be affected. |
- tracker.CleanupSession(tag1); |
+ GetTracker()->CleanupSession(tag1); |
// Verify that only those parts of the session not owned have been removed. |
ASSERT_EQ(1U, session1->windows.size()); |
ASSERT_EQ(4U, session1->windows[0]->tabs.size()); |
ASSERT_EQ(1U, session2->windows.size()); |
ASSERT_EQ(1U, session2->windows[2]->tabs.size()); |
- ASSERT_EQ(2U, tracker.num_synced_sessions()); |
- ASSERT_EQ(4U, tracker.num_synced_tabs(tag1)); |
- ASSERT_EQ(1U, tracker.num_synced_tabs(tag2)); |
+ ASSERT_EQ(2U, GetTracker()->num_synced_sessions()); |
+ ASSERT_EQ(4U, GetTracker()->num_synced_tabs(tag1)); |
+ ASSERT_EQ(1U, GetTracker()->num_synced_tabs(tag2)); |
// All memory should be properly deallocated by destructor for the |
// SyncedSessionTracker. |