Switch AutomationTabHelper to use WebContentsUserData.

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 1767 matching lines @@
       reply_message_(reply_message),
       tab_contents_(tab_contents),
       image_path_(path) {
   registrar_.Add(this, chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
                  content::NotificationService::AllSources());
 }
 
 PageSnapshotTaker::~PageSnapshotTaker() {}
 
 void PageSnapshotTaker::Start() {
-  StartObserving(tab_contents_->automation_tab_helper());
-  tab_contents_->automation_tab_helper()->SnapshotEntirePage();
+  AutomationTabHelper* automation_tab_helper =
+      AutomationTabHelper::FromWebContents(tab_contents_->web_contents());
+  StartObserving(automation_tab_helper);
+  automation_tab_helper->SnapshotEntirePage();
 }
 
 void PageSnapshotTaker::OnSnapshotEntirePageACK(
     bool success,
     const std::vector<unsigned char>& png_data,
     const std::string& error_msg) {
   bool overall_success = success;
   std::string overall_error_msg = error_msg;
   if (success) {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ skipping 554 matching lines @@
                  chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_LOAD_STOP,
                  content::NotificationService::AllSources());
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end();
        ++iter) {
     Browser* browser = *iter;
     for (int i = 0; i < browser->tab_count(); ++i) {
-      TabContents* tab_contents = chrome::GetTabContentsAt(browser, i);
-      StartObserving(tab_contents->automation_tab_helper());
-      if (tab_contents->automation_tab_helper()->has_pending_loads())
-        pending_tabs_.insert(tab_contents->web_contents());
+      WebContents* web_contents = chrome::GetWebContentsAt(browser, i);
+      AutomationTabHelper* automation_tab_helper =
+          AutomationTabHelper::FromWebContents(web_contents);
+      StartObserving(automation_tab_helper);
+      if (automation_tab_helper->has_pending_loads())
+        pending_tabs_.insert(web_contents);
     }
   }
   CheckIfNoMorePendingLoads();
 }
 
 AllViewsStoppedLoadingObserver::~AllViewsStoppedLoadingObserver() {
 }
 
 void AllViewsStoppedLoadingObserver::OnFirstPendingLoad(
     content::WebContents* web_contents) {
@@ skipping 496 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }