Switch OneClickSigninHelper to use WebContentsUserData.

chrome/browser/ui/sync/one_click_signin_helper.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/sync/one_click_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/field_trial.h"
@@ skipping 30 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/forms/password_form.h"
 #include "webkit/forms/password_form_dom_manager.h"
 
+int OneClickSigninHelper::kUserDataKey;
+
 namespace {
 
 // Set to true if this chrome instance is in the blue-button-on-white-bar
 // experimental group.
 bool use_blue_on_white = false;
 
 // Start syncing with the given user information.
 void StartSync(content::WebContents* web_contents,
                const std::string& session_index,
                const std::string& email,
@@ skipping 310 matching lines @@
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   content::WebContents* web_contents = tab_util::GetWebContentsByID(child_id,
                                                                     route_id);
 
   // TODO(mathp): The appearance of this infobar should be tested using a
   // browser_test.
   if (!web_contents || !CanOffer(web_contents, email, true))
     return;
 
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents);
-  if (!tab_contents)
+  OneClickSigninHelper* one_click_signin_tab_helper =
+      OneClickSigninHelper::FromWebContents(web_contents);
+  // The manager may not exist if the contents is incognito or if the profile is
+  // already connected to a Google account.
+  if (!one_click_signin_tab_helper)
     return;
 
-  // Save the email in the one-click signin manager.  The manager may
-  // not exist if the contents is incognito or if the profile is already
-  // connected to a Google account.
-  OneClickSigninHelper* helper = tab_contents->one_click_signin_helper();
-  if (helper)
-    helper->SaveSessionIndexAndEmail(session_index, email);
+  one_click_signin_tab_helper->SaveSessionIndexAndEmail(session_index, email);
 }
 
 void OneClickSigninHelper::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (params.password_form.origin.is_valid())
     SavePassword(UTF16ToUTF8(params.password_form.password_value));
 }
 
 void OneClickSigninHelper::DidStopLoading(
@@ skipping 17 matching lines @@
   session_index_ = session_index;
   email_ = email;
 }
 
 void OneClickSigninHelper::SavePassword(const std::string& password) {
   // TODO(rogerta): in the case of a 2-factor or captcha or some other type of
   // challenge, its possible for the user to never complete the signin.
   // Should have a way to detect this and clear the password member.
   password_ = password;
 }