Merge 208347 "Revert 208315 "Make use of InvalidationService""

chrome/browser/chrome_to_mobile_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.
 
 #ifndef CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 #define CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 183 matching lines @@
   // Virtual for unit test mocking.
   virtual void RequestDeviceSearch();
 
   void HandleSearchResponse(const net::URLFetcher* source);
   void HandleSubmitResponse(const net::URLFetcher* source);
 
   base::WeakPtrFactory<ChromeToMobileService> weak_ptr_factory_;
 
   Profile* profile_;
 
-  // Invalidation service state. Chrome To Mobile requires this service to keep
-  // the mobile device list up to date and prevent page send failures.
-  bool invalidation_enabled_;
+  // Sync invalidation service state. Chrome To Mobile requires this service to
+  // to keep the mobile device list up to date and prevent page send failures.
+  bool sync_invalidation_enabled_;
 
   // Used to recieve TokenService notifications for GaiaOAuth2LoginRefreshToken.
   content::NotificationRegistrar registrar_;
 
   // The cloud print service URL and auth access token.
   GURL cloud_print_url_;
   std::string access_token_;
 
   // The set of snapshots currently available.
   std::set<base::FilePath> snapshots_;
@@ skipping 11 matching lines @@
   base::OneShotTimer<ChromeToMobileService> auth_retry_timer_;
   base::OneShotTimer<ChromeToMobileService> search_retry_timer_;
 
   // A queue of tasks to perform after an access token is lazily initialized.
   std::queue<base::Closure> task_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeToMobileService);
 };
 
 #endif  // CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_