Switch TabContentsSyncedTabDelegate to use WebContentsUserData.

chrome/browser/sync/glue/session_change_processor.cc

 // Copyright (c) 2012 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/session_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 27 matching lines @@
 namespace {
 
 // The URL at which the set of synced tabs is displayed. We treat it differently
 // from all other URL's as accessing it triggers a sync refresh of Sessions.
 static const char kNTPOpenTabSyncURL[] = "chrome://newtab/#open_tabs";
 
 // Extract the source SyncedTabDelegate from a NotificationSource originating
 // from a NavigationController, if it exists. Returns |NULL| otherwise.
 SyncedTabDelegate* ExtractSyncedTabDelegate(
     const content::NotificationSource& source) {
-  TabContents* tab = TabContents::FromWebContents(
+  return TabContentsSyncedTabDelegate::FromWebContents(
       content::Source<NavigationController>(source).ptr()->GetWebContents());
-  if (!tab)
-    return NULL;
-  return tab->synced_tab_delegate();
 }
 
 }  // namespace
 
 SessionChangeProcessor::SessionChangeProcessor(
     DataTypeErrorHandler* error_handler,
     SessionModelAssociator* session_model_associator)
     : ChangeProcessor(error_handler),
       session_model_associator_(session_model_associator),
       profile_(NULL),
@@ skipping 41 matching lines @@
     case chrome::NOTIFICATION_BROWSER_OPENED: {
       Browser* browser = content::Source<Browser>(source).ptr();
       if (!browser || browser->profile() != profile_) {
         return;
       }
       DVLOG(1) << "Received BROWSER_OPENED for profile " << profile_;
       break;
     }
 
     case chrome::NOTIFICATION_TAB_PARENTED: {
-      TabContents* tab_contents = TabContents::FromWebContents(
-          content::Source<WebContents>(source).ptr());
-      SyncedTabDelegate* tab = tab_contents->synced_tab_delegate();
+      WebContents* web_contents = content::Source<WebContents>(source).ptr();
+      SyncedTabDelegate* tab =
+          TabContentsSyncedTabDelegate::FromWebContents(web_contents);
       if (!tab || tab->profile() != profile_) {
         return;
       }
       modified_tabs.push_back(tab);
       DVLOG(1) << "Received TAB_PARENTED for profile " << profile_;
       break;
     }
 
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
-      TabContents* tab_contents = TabContents::FromWebContents(
-          content::Source<WebContents>(source).ptr());
-      if (!tab_contents) {
-        return;
-      }
-      SyncedTabDelegate* tab = tab_contents->synced_tab_delegate();
+      WebContents* web_contents = content::Source<WebContents>(source).ptr();
+      SyncedTabDelegate* tab =
+          TabContentsSyncedTabDelegate::FromWebContents(web_contents);
       if (!tab || tab->profile() != profile_) {
         return;
       }
       modified_tabs.push_back(tab);
       DVLOG(1) << "Received LOAD_COMPLETED_MAIN_FRAME for profile " << profile_;
       break;
     }
 
     case chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED: {
       TabContents* tab_contents = content::Source<TabContents>(source).ptr();
-      SyncedTabDelegate* tab = tab_contents->synced_tab_delegate();
+      SyncedTabDelegate* tab = TabContentsSyncedTabDelegate::FromWebContents(
+          tab_contents->web_contents());
       if (!tab || tab->profile() != profile_)
         return;
       modified_tabs.push_back(tab);
       DVLOG(1) << "Received NOTIFICATION_TAB_CONTENTS_DESTROYED for profile "
                << profile_;
       break;
     }
 
     case content::NOTIFICATION_NAV_LIST_PRUNED: {
       SyncedTabDelegate* tab = ExtractSyncedTabDelegate(source);
@@ skipping 26 matching lines @@
     }
 
     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_) {
         return;
       }
       if (extension_tab_helper->extension_app()) {
-        TabContents* tab_contents =
-            TabContents::FromWebContents(extension_tab_helper->web_contents());
-        modified_tabs.push_back(tab_contents->synced_tab_delegate());
+        SyncedTabDelegate* tab = TabContentsSyncedTabDelegate::FromWebContents(
+            extension_tab_helper->web_contents());
+        modified_tabs.push_back(tab);
       }
       DVLOG(1) << "Received TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED "
                << "for profile " << profile_;
       break;
     }
 
     default:
       LOG(ERROR) << "Received unexpected notification of type "
                   << type;
       break;
@@ skipping 154 matching lines @@
   notification_registrar_.Add(this, chrome::NOTIFICATION_FAVICON_CHANGED,
       content::Source<Profile>(profile_));
 }
 
 void SessionChangeProcessor::StopObserving() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync