| Index: chrome/browser/ui/sync/one_click_signin_helper.h
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
|
| index 88fd20b65034085bff7bec1bbbdd8611df5fdec4..4cfb8bf0ca49d8b9860b373d80e133c3facada76 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_helper.h
|
| +++ b/chrome/browser/ui/sync/one_click_signin_helper.h
|
| @@ -44,8 +44,7 @@ class URLRequest;
|
| // more about what this means.
|
| class OneClickSigninHelper
|
| : public content::WebContentsObserver,
|
| - public content::WebContentsUserData<OneClickSigninHelper>,
|
| - public ProfileSyncServiceObserver {
|
| + public content::WebContentsUserData<OneClickSigninHelper> {
|
| public:
|
| // Represents user's decision about sign in process.
|
| enum AutoAccept {
|
| @@ -121,9 +120,9 @@ class OneClickSigninHelper
|
| OneClickSigninSyncStarter::Callback callback;
|
| };
|
|
|
| - // Wrapper to call OneClickSigninSyncStarter after fetching the refresh
|
| - // token if needed. Also verifies that the cookie are correct if no password
|
| - // is specified, and checks that the email from the cookies match the expected
|
| + // Wrapper to call OneClickSigninSyncStarter after fetching the refresh token
|
| + // if needed. Also verifies that the cookies are correct if no password is
|
| + // specified, and checks that the email from the cookies match the expected
|
| // email address.
|
| class SyncStarterWrapper : public SigninOAuthHelper::Consumer,
|
| public chrome::BrowserListObserver {
|
| @@ -253,6 +252,7 @@ class OneClickSigninHelper
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest, SigninFailed);
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
|
| CleanTransientStateOnNavigate);
|
| + // TODO(isherman): Move this test?
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperTest,
|
| RemoveObserverFromProfileSyncService);
|
| FRIEND_TEST_ALL_PREFIXES(OneClickSigninHelperIOTest, CanOfferOnIOThread);
|
| @@ -342,10 +342,6 @@ class OneClickSigninHelper
|
| const content::FrameNavigateParams& params) OVERRIDE;
|
| virtual void DidStopLoading(
|
| content::RenderViewHost* render_view_host) OVERRIDE;
|
| - virtual void WebContentsDestroyed(content::WebContents* contents) OVERRIDE;
|
| -
|
| - // ProfileSyncServiceObserver.
|
| - virtual void OnStateChanged() OVERRIDE;
|
|
|
| OneClickSigninSyncStarter::Callback CreateSyncStarterCallback();
|
|
|
|
|