[Sync] Remove static methods on SyncedWindowDelegate.

chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

Index: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
index 70f8165e6403ebbe4366c539320801f861896fce..97d99be20e70b9e37c665603815bfb8fb911d4ab 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
 #include "chrome/browser/sync/sessions/synced_window_delegates_getter.h"
+#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ -113,6 +114,11 @@ class TestSyncedWindowDelegatesGetter : public SyncedWindowDelegatesGetter {
   std::set<const SyncedWindowDelegate*> GetSyncedWindowDelegates() override {
     return delegates_;
   }
+
+  const SyncedWindowDelegate* FindById(SessionID::id_type id) override {
+    return NULL;
+  }
+
  private:
   const std::set<const SyncedWindowDelegate*> delegates_;
 };
@@ -230,6 +236,11 @@ scoped_ptr<LocalSessionEventRouter> NewDummyRouter() {
   return scoped_ptr<LocalSessionEventRouter>(new DummyRouter());
 }
 
+scoped_ptr<SyncedWindowDelegatesGetter> NewBrowserWindowGetter() {
+  return scoped_ptr<SyncedWindowDelegatesGetter>(

[Nicolas Zea, 2015/08/31 22:12:47]

I think you can just return the pointer here? Alternatively, use make_scoped_ptr

[maxbogue, 2015/09/01 17:29:27]

Done.

+      new BrowserSyncedWindowDelegatesGetter());
+}
+
 }  // namespace
 
 class SessionsSyncManagerTest
@@ -251,8 +262,10 @@ class SessionsSyncManagerTest
     browser_sync::NotificationServiceSessionsRouter* router(
         new browser_sync::NotificationServiceSessionsRouter(
             profile(), syncer::SyncableService::StartSyncFlare()));
-    manager_.reset(new SessionsSyncManager(profile(), local_device_.get(),
-      scoped_ptr<LocalSessionEventRouter>(router)));
+    manager_.reset(new SessionsSyncManager(
+        profile(), local_device_.get(),
+        scoped_ptr<LocalSessionEventRouter>(router),
+        NewBrowserWindowGetter()));
   }
 
   void TearDown() override {
@@ -801,7 +814,8 @@ TEST_F(SessionsSyncManagerTest, MergeLocalSessionNoTabs) {
       syncer::AttachmentServiceProxyForTest::Create()));
   syncer::SyncDataList in(&d, &d + 1);
   out.clear();
-  SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter());
+  SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter(),
+                               NewBrowserWindowGetter());
   syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing(
       syncer::SESSIONS, in,
       scoped_ptr<syncer::SyncChangeProcessor>(
@@ -864,7 +878,7 @@ TEST_F(SessionsSyncManagerTest, SwappedOutOnRestore) {
   manager()->StopSyncing(syncer::SESSIONS);
 
   const std::set<const SyncedWindowDelegate*>& windows =
-      SyncedWindowDelegate::GetAll();
+      manager()->GetSyncedWindowDelegatesGetter()->GetSyncedWindowDelegates();
   ASSERT_EQ(1U, windows.size());
   SyncedTabDelegateFake t1_override, t2_override;
   t1_override.SetSyncId(1);  // No WebContents by default.
@@ -1390,7 +1404,8 @@ TEST_F(SessionsSyncManagerTest, SaveUnassociatedNodesForReassociation) {
       syncer::AttachmentServiceProxyForTest::Create()));
   syncer::SyncDataList in(&d, &d + 1);
   changes.clear();
-  SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter());
+  SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter(),
+                               NewBrowserWindowGetter());
   syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing(
       syncer::SESSIONS, in,
       scoped_ptr<syncer::SyncChangeProcessor>(