[Sync] Remove static methods on SyncedWindowDelegate.

chrome/browser/sync/glue/synced_tab_delegate_android.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_android.h"
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/synced_window_delegate.h"
+#include "chrome/browser/sync/glue/synced_window_delegates_getter_android.h"
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationEntry;
 
 namespace browser_sync {
 SyncedTabDelegateAndroid::SyncedTabDelegateAndroid(TabAndroid* tab_android)
     : web_contents_(NULL), tab_android_(tab_android) {}
 
@@ skipping 90 matching lines @@
 }
 
 void SyncedTabDelegateAndroid::SetSyncId(int sync_id) {
   tab_android_->SetSyncId(sync_id);
 }
 
 // static
 SyncedTabDelegate* SyncedTabDelegate::ImplFromWebContents(
     content::WebContents* web_contents) {
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
-  return tab ? tab->GetSyncedTabDelegate() : NULL;
+  if (!tab) {
+    return NULL;

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

nit: style guide recommends nullptr for all new code, so even if you don't clean
up the rest of the file, I'd say use it here.

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

Done.

+  }
+  SyncedTabDelegate* delegate = tab->GetSyncedTabDelegate();

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

Can delegate be null? Should that be handled?

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

Yes, thank you. I forgot there were two versions of this function.

+  delegate->SetSyncedWindowGetter(make_scoped_ptr(
+      new SyncedWindowDelegatesGetterAndroid()));
+  return delegate;
 }
 
 }  // namespace browser_sync