Switch OneClickSigninHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.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/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
@@ skipping 174 matching lines @@
   print_view_manager_.reset(new printing::PrintViewManager(this));
   print_preview_.reset(new printing::PrintPreviewMessageHandler(contents));
 #endif
 
   // Start the in-browser thumbnailing if the feature is enabled.
   if (ShouldEnableInBrowserThumbnailing()) {
     thumbnail_generator_.reset(new ThumbnailGenerator);
     thumbnail_generator_->StartThumbnailing(web_contents_.get());
   }
 
+#if defined(ENABLE_ONE_CLICK_SIGNIN)
   // If this is not an incognito window, setup to handle one-click login.
   // We don't want to check that the profile is already connected at this time
   // because the connected state may change while this tab is open.  Having a
   // one-click signin helper attached does not cause problems if the profile
   // happens to be already connected.
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
   if (OneClickSigninHelper::CanOffer(contents, "", false))
-      one_click_signin_helper_.reset(new OneClickSigninHelper(contents));
+      OneClickSigninHelper::CreateForWebContents(contents);
 #endif
 }
 
 TabContents::~TabContents() {
   in_destructor_ = true;
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       content::Source<TabContents>(this),
       content::NotificationService::NoDetails());
@@ skipping 34 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
 void TabContents::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }