Un-refcount AutofillWebData and TokenWebData

chrome/browser/signin/token_service.h

 // 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.
 //
 // The TokenService will supply authentication tokens for any service that
 // needs it, such as sync. Whenever the user logs in, a controller watching
 // the token service is expected either to call ClientLogin to derive a new
 // SID and LSID, or to use GAIA OAuth requests to derive an OAuth1 access
 // token for the OAuthLogin scope.  Whenever such credentials are available,
 // the TokenService should be updated with new credentials.  The controller
@@ skipping 210 matching lines @@
 
   void SaveAuthTokenToDB(const std::string& service,
                          const std::string& auth_token);
 
   // Returns the index of the given service.
   static int GetServiceIndex(const std::string& service);
 
   // The profile with which this instance was initialized, or NULL.
   Profile* profile_;
 
-  // Web data service to access tokens from.
-  scoped_refptr<TokenWebData> token_web_data_;
+  // Web data service to access tokens from. Owned by WebDataServiceWrapper,
+  // which outlives TokenService.
+  TokenWebData* token_web_data_;
+
   // Getter to use for fetchers.
   scoped_refptr<net::URLRequestContextGetter> getter_;
   // Request handle to load Gaia tokens from DB.
   WebDataServiceBase::Handle token_loading_query_;
   // True if token loading has completed (regardless of success).
   bool tokens_loaded_;
 
   // Gaia request source for Gaia accounting.
   std::string source_;
   // Credentials from ClientLogin for Issuing auth tokens.
@@ skipping 15 matching lines @@
 
   friend class TokenServiceTest;
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryBasic);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryAdvanced);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, FullIntegrationNewServicesAdded);
 
   DISALLOW_COPY_AND_ASSIGN(TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_TOKEN_SERVICE_H_