Fix WeakPtrFactory member in SSOAccessTokenFetcher

This forces WeakPtrs to be invalidated before other members' destructors run. See the bug or the documentation of WeakPtrFactory for more information. I'm in the process of trying to turn on a clang check for this (see the bug). BUG=303818 [email protected] Review URL: https://codereview.chromium.org/827093006 Cr-Commit-Position: refs/heads/master@{#311408}
crosswalk-project · Jan 14, 2015 · 19e69d4 · 19e69d4
1 parent 6e408ee
commit 19e69d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/components/signin/ios/browser/profile_oauth2_token_service_ios.mm b/components/signin/ios/browser/profile_oauth2_token_service_ios.mm
@@ -75,10 +75,10 @@ void OnAccessTokenResponse(NSString* token,
                              NSError* error);
 
  private:
-  base::WeakPtrFactory<SSOAccessTokenFetcher> weak_factory_;
   ios::ProfileOAuth2TokenServiceIOSProvider* provider_;  // weak
   std::string account_id_;
   bool request_was_cancelled_;
+  base::WeakPtrFactory<SSOAccessTokenFetcher> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SSOAccessTokenFetcher);
 };
@@ -88,10 +88,10 @@ void OnAccessTokenResponse(NSString* token,
     ios::ProfileOAuth2TokenServiceIOSProvider* provider,
     const std::string account_id)
     : OAuth2AccessTokenFetcher(consumer),
-      weak_factory_(this),
       provider_(provider),
       account_id_(account_id),
-      request_was_cancelled_(false) {
+      request_was_cancelled_(false),
+      weak_factory_(this) {
   DCHECK(provider_);
 }