Switch AutomationTabHelper to use WebContentsUserData.

chrome/browser/automation/automation_tab_helper_unittest.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 <map>
 
 #include "base/basictypes.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/automation/mock_tab_event_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 21 matching lines @@
   // |AutomationTabHelper| friend.
   void StartLoading() {
     tab_helper()->DidStartLoading(NULL);
   }
 
   void StopLoading() {
     tab_helper()->DidStopLoading(NULL);
   }
 
   void TabContentsDestroyed() {
-    tab_helper()->WebContentsDestroyed(tab_contents()->web_contents());
+    tab_helper()->WebContentsDestroyed(web_contents());
   }
 
   void WillPerformClientRedirect(int64 frame_id) {
     tab_helper()->OnWillPerformClientRedirect(frame_id, 0);
   }
 
   void CompleteOrCancelClientRedirect(int64 frame_id) {
     tab_helper()->OnDidCompleteOrCancelClientRedirect(frame_id);
   }
 
   AutomationTabHelper* tab_helper() {
-    return tab_contents()->automation_tab_helper();
+    return AutomationTabHelper::FromWebContents(web_contents());
   }
 
   content::TestBrowserThread browser_thread_;
 
   MockTabEventObserver mock_observer_;
 };
 
 ACTION_P2(CheckHasPendingLoads, tab_helper, has_pending_loads) {
   EXPECT_EQ(has_pending_loads, tab_helper->has_pending_loads());
 }
@@ skipping 139 matching lines @@
 
   testing::InSequence expect_in_sequence;
   EXPECT_CALL(mock_observer_, OnFirstPendingLoad(contents()));
   EXPECT_CALL(mock_observer_, OnNoMorePendingLoads(contents()));
 
   StartLoading();
   WillPerformClientRedirect(1);
   TabContentsDestroyed();
   EXPECT_FALSE(tab_helper()->has_pending_loads());
 }