[Sync] Componentize synced_tab_delegate

chrome/browser/sync/sessions/notification_service_sessions_router.cc

Index: chrome/browser/sync/sessions/notification_service_sessions_router.cc
diff --git a/chrome/browser/sync/sessions/notification_service_sessions_router.cc b/chrome/browser/sync/sessions/notification_service_sessions_router.cc
index f685a92d725a4815a212523168c003f97d66965b..685fdfb838d09cb56d82aa0c99774284b179015d 100644
--- a/chrome/browser/sync/sessions/notification_service_sessions_router.cc
+++ b/chrome/browser/sync/sessions/notification_service_sessions_router.cc
@@ -9,9 +9,11 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
-#include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
+#include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/sync_sessions/synced_tab_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
@@ -19,6 +21,10 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/tab_android.h"
+#endif
+
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
@@ -33,6 +39,27 @@ using content::WebContents;
 
 namespace browser_sync {
 
+namespace {
+
+SyncedTabDelegate* GetSyncedTabDelegateFromWebContents(
+    content::WebContents* web_contents) {
+#if defined(OS_ANDROID)
+  TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
+  return tab ? tab->GetSyncedTabDelegate() : nullptr;
+#else   // OS_ANDROID
+  SyncedTabDelegate* delegate =
+      TabContentsSyncedTabDelegate::FromWebContents(web_contents);
+  if (!delegate) {
+    return nullptr;
+  }
+  delegate->SetSyncedWindowGetter(
+      make_scoped_ptr(new BrowserSyncedWindowDelegatesGetter()));
+  return delegate;
+#endif  // OS_ANDROID
+}
+
+}  // namespace
+
 NotificationServiceSessionsRouter::NotificationServiceSessionsRouter(
     Profile* profile, const syncer::SyncableService::StartSyncFlare& flare)
         : handler_(NULL),
@@ -88,13 +115,14 @@ void NotificationServiceSessionsRouter::Observe(
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: {
       WebContents* web_contents = content::Source<WebContents>(source).ptr();
+      if (Profile::FromBrowserContext(web_contents->GetBrowserContext()) !=
+          profile_)
+        return;
       SyncedTabDelegate* tab =
-          SyncedTabDelegate::ImplFromWebContents(web_contents);
-      if (!tab || tab->profile() != profile_)
+          GetSyncedTabDelegateFromWebContents(web_contents);
+      if (!tab)
         return;
-      if (handler_)
-        handler_->OnLocalTabModified(tab);
-      if (!tab->ShouldSync())
+      if (handler_ && !handler_->OnLocalTabModified(tab))
         return;
       break;
     }
@@ -102,14 +130,16 @@ void NotificationServiceSessionsRouter::Observe(
     case content::NOTIFICATION_NAV_LIST_PRUNED:
     case content::NOTIFICATION_NAV_ENTRY_CHANGED:
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      SyncedTabDelegate* tab = SyncedTabDelegate::ImplFromWebContents(
-          content::Source<NavigationController>(source).ptr()->
-              GetWebContents());
-      if (!tab || tab->profile() != profile_)
+      WebContents* web_contents =
+          content::Source<NavigationController>(source).ptr()->GetWebContents();
+      if (Profile::FromBrowserContext(web_contents->GetBrowserContext()) !=
+          profile_)
         return;
-      if (handler_)
-        handler_->OnLocalTabModified(tab);
-      if (!tab->ShouldSync())
+      SyncedTabDelegate* tab =
+          GetSyncedTabDelegateFromWebContents(web_contents);
+      if (!tab)
+        return;
+      if (handler_ && !handler_->OnLocalTabModified(tab))
         return;
       break;
     }
@@ -117,17 +147,18 @@ void NotificationServiceSessionsRouter::Observe(
     case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
       extensions::TabHelper* extension_tab_helper =
           content::Source<extensions::TabHelper>(source).ptr();
-      if (extension_tab_helper->web_contents()->GetBrowserContext() !=
-              profile_) {
+      if (Profile::FromBrowserContext(
+              extension_tab_helper->web_contents()->GetBrowserContext()) !=
+          profile_) {
         return;
       }
       if (extension_tab_helper->extension_app()) {
-        SyncedTabDelegate* tab = SyncedTabDelegate::ImplFromWebContents(
+        SyncedTabDelegate* tab = GetSyncedTabDelegateFromWebContents(
             extension_tab_helper->web_contents());
-        if (!tab || tab->profile() != profile_)
+        if (!tab)
+          return;
+        if (handler_ && !handler_->OnLocalTabModified(tab))
           return;
-        if (handler_)
-          handler_->OnLocalTabModified(tab);
         break;
       }
       return;
@@ -146,12 +177,12 @@ void NotificationServiceSessionsRouter::Observe(
 
 void NotificationServiceSessionsRouter::OnNavigationBlocked(
     content::WebContents* web_contents) {
-  SyncedTabDelegate* tab =
-      SyncedTabDelegate::ImplFromWebContents(web_contents);
+  DCHECK_EQ(profile_,
+            Profile::FromBrowserContext(web_contents->GetBrowserContext()));
+  SyncedTabDelegate* tab = GetSyncedTabDelegateFromWebContents(web_contents);
   if (!tab || !handler_)
     return;
 
-  DCHECK(tab->profile() == profile_);
   handler_->OnLocalTabModified(tab);
 }