[Sync] Remove static methods on SyncedWindowDelegate.

chrome/browser/sync/glue/synced_tab_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 
-#include "chrome/browser/sync/glue/synced_window_delegate.h"
+#include "base/logging.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "url/gurl.h"
 
 using browser_sync::SyncedTabDelegate;
 
 namespace browser_sync {
 
+SyncedTabDelegate::SyncedTabDelegate() {}
+SyncedTabDelegate::~SyncedTabDelegate() {}
+
 content::NavigationEntry* SyncedTabDelegate::GetCurrentEntryMaybePending()
     const {
   return GetEntryAtIndexMaybePending(GetCurrentEntryIndex());
 }
 
 content::NavigationEntry* SyncedTabDelegate::GetEntryAtIndexMaybePending(
     int i) const {
   return (GetPendingEntryIndex() == i) ? GetPendingEntry() : GetEntryAtIndex(i);
 }
 
 bool SyncedTabDelegate::ShouldSync() const {
-  if (GetSyncedWindowDelegate() == NULL)
+  if (GetSyncedWindowDelegate() == nullptr)
     return false;
 
   // Is there a valid NavigationEntry?
   if (ProfileIsSupervised() && GetBlockedNavigations()->size() > 0)
     return true;
 
   int entry_count = GetEntryCount();
   if (entry_count == 0)
     return false;  // This deliberately ignores a new pending entry.
 
@@ skipping 12 matching lines @@
       found_valid_url = true;
     } else if (virtual_url == GURL(chrome::kChromeUIHistoryURL)) {
       // The history page is treated specially as we want it to trigger syncable
       // events for UI purposes.
       found_valid_url = true;
     }
   }
   return found_valid_url;
 }
 
+void SyncedTabDelegate::SetSyncedWindowGetter(
+    scoped_ptr<SyncedWindowDelegatesGetter> getter) {
+  synced_window_getter_.reset(getter.release());
+}
+
 const SyncedWindowDelegate* SyncedTabDelegate::GetSyncedWindowDelegate() const {
-  return SyncedWindowDelegate::FindById(GetWindowId());
+  if (!synced_window_getter_) {
+    NOTREACHED();

[Nicolas Zea, 2015/09/02 21:19:43]

Generally you shouldn't NOTREACH for a case that you're handling. In other
words, if this is invalid, it's better to let it crash below (so we can identify
that it's actually happening). If it's not invalid, then remove the NOTREACHED.

[maxbogue, 2015/09/02 23:05:40]

Ah, ok. It is invalid, so I've removed the return.

+    return nullptr;
+  }
+  return synced_window_getter_->FindById(GetWindowId());
 }
 
 }  // namespace browser_sync