[invalidations] RequestDetailedStatus is now const function

This minor patch fixes the RequestDetailedStatus everywhere, making it a
const function. There should be no side effects to requesting debugging
information, and this patch enforces that.

BUG=263863

Review URL: https://codereview.chromium.org/202333007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259044 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 30 insertions, 25 deletions

diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc
index b0cad99..018f2f6 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc
@@ -36,8 +36,8 @@ class MockInvalidationService : public invalidation::InvalidationService {
   MOCK_CONST_METHOD0(GetInvalidatorState, syncer::InvalidatorState());
   MOCK_CONST_METHOD0(GetInvalidatorClientId, std::string());
   MOCK_METHOD0(GetInvalidationLogger, invalidation::InvalidationLogger*());
-  MOCK_METHOD1(RequestDetailedStatus,
-               void(base::Callback<void(const base::DictionaryValue&)>));
+  MOCK_CONST_METHOD1(RequestDetailedStatus,
+                     void(base::Callback<void(const base::DictionaryValue&)>));
   MOCK_METHOD0(GetInvalidationAuthProvider,
                invalidation::InvalidationAuthProvider*());
 
diff --git a/chrome/browser/invalidation/fake_invalidation_service.cc b/chrome/browser/invalidation/fake_invalidation_service.cc
index 56b41e9..8c34f00 100644
--- a/chrome/browser/invalidation/fake_invalidation_service.cc
+++ b/chrome/browser/invalidation/fake_invalidation_service.cc
@@ -68,7 +68,7 @@ InvalidationLogger* FakeInvalidationService::GetInvalidationLogger() {
 }
 
 void FakeInvalidationService::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> caller) {
+    base::Callback<void(const base::DictionaryValue&)> caller) const {
   base::DictionaryValue value;
   caller.Run(value);
 }
diff --git a/chrome/browser/invalidation/fake_invalidation_service.h b/chrome/browser/invalidation/fake_invalidation_service.h
index 661c9d0..d958bf5 100644
--- a/chrome/browser/invalidation/fake_invalidation_service.h
+++ b/chrome/browser/invalidation/fake_invalidation_service.h
@@ -70,7 +70,7 @@ class FakeInvalidationService : public InvalidationService {
   virtual std::string GetInvalidatorClientId() const OVERRIDE;
   virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
   virtual InvalidationAuthProvider* GetInvalidationAuthProvider() OVERRIDE;
 
   void SetInvalidatorState(syncer::InvalidatorState state);
diff --git a/chrome/browser/invalidation/invalidation_service.h b/chrome/browser/invalidation/invalidation_service.h
index ed026c3..f5f8717 100644
--- a/chrome/browser/invalidation/invalidation_service.h
+++ b/chrome/browser/invalidation/invalidation_service.h
@@ -107,7 +107,7 @@ class InvalidationService : public KeyedService {
 
   // Triggers requests of internal status.
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> post_caller) = 0;
+      base::Callback<void(const base::DictionaryValue&)> post_caller) const = 0;
 
   // Returns the authentication provider.
   virtual InvalidationAuthProvider* GetInvalidationAuthProvider() = 0;
diff --git a/chrome/browser/invalidation/invalidation_service_android.cc b/chrome/browser/invalidation/invalidation_service_android.cc
index c7bc445..f53f5be 100644
--- a/chrome/browser/invalidation/invalidation_service_android.cc
+++ b/chrome/browser/invalidation/invalidation_service_android.cc
@@ -65,7 +65,7 @@ InvalidationLogger* InvalidationServiceAndroid::GetInvalidationLogger() {
 }
 
 void InvalidationServiceAndroid::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> return_callback) {
+    base::Callback<void(const base::DictionaryValue&)> return_callback) const {
 }
 
 InvalidationAuthProvider*
diff --git a/chrome/browser/invalidation/invalidation_service_android.h b/chrome/browser/invalidation/invalidation_service_android.h
index 917d9a3..039bacb 100644
--- a/chrome/browser/invalidation/invalidation_service_android.h
+++ b/chrome/browser/invalidation/invalidation_service_android.h
@@ -53,7 +53,8 @@ class InvalidationServiceAndroid
   virtual std::string GetInvalidatorClientId() const OVERRIDE;
   virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const
+      OVERRIDE;
   virtual InvalidationAuthProvider* GetInvalidationAuthProvider() OVERRIDE;
 
   // content::NotificationObserver implementation.
diff --git a/chrome/browser/invalidation/p2p_invalidation_service.cc b/chrome/browser/invalidation/p2p_invalidation_service.cc
index 4ee9f91..d9cde3f 100644
--- a/chrome/browser/invalidation/p2p_invalidation_service.cc
+++ b/chrome/browser/invalidation/p2p_invalidation_service.cc
@@ -79,7 +79,7 @@ InvalidationLogger* P2PInvalidationService::GetInvalidationLogger() {
 }
 
 void P2PInvalidationService::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> caller) {
+    base::Callback<void(const base::DictionaryValue&)> caller) const {
   base::DictionaryValue value;
   caller.Run(value);
 }
diff --git a/chrome/browser/invalidation/p2p_invalidation_service.h b/chrome/browser/invalidation/p2p_invalidation_service.h
index 0eb7e53..af493a4 100644
--- a/chrome/browser/invalidation/p2p_invalidation_service.h
+++ b/chrome/browser/invalidation/p2p_invalidation_service.h
@@ -47,7 +47,7 @@ class P2PInvalidationService
   virtual std::string GetInvalidatorClientId() const OVERRIDE;
   virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
   virtual InvalidationAuthProvider* GetInvalidationAuthProvider() OVERRIDE;
 
   void UpdateCredentials(const std::string& username,
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
index 28c9c9d..2280328 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -181,7 +181,7 @@ TiclInvalidationService::GetInvalidationAuthProvider() {
 }
 
 void TiclInvalidationService::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> return_callback) {
+    base::Callback<void(const base::DictionaryValue&)> return_callback) const {
   return_callback.Run(network_channel_options_);
   invalidator_->RequestDetailedStatus(return_callback);
 }
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/chrome/browser/invalidation/ticl_invalidation_service.h
index 19aa762..e613988 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.h
+++ b/chrome/browser/invalidation/ticl_invalidation_service.h
@@ -68,7 +68,7 @@ class TiclInvalidationService : public base::NonThreadSafe,
   virtual std::string GetInvalidatorClientId() const OVERRIDE;
   virtual InvalidationLogger* GetInvalidationLogger() OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> caller) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> caller) const OVERRIDE;
   virtual InvalidationAuthProvider* GetInvalidationAuthProvider() OVERRIDE;
 
   void RequestAccessToken();
diff --git a/sync/notifier/fake_invalidator.cc b/sync/notifier/fake_invalidator.cc
index 2a321f1..dc41518 100644
--- a/sync/notifier/fake_invalidator.cc
+++ b/sync/notifier/fake_invalidator.cc
@@ -62,7 +62,7 @@ void FakeInvalidator::UpdateCredentials(
 }
 
 void FakeInvalidator::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   base::DictionaryValue value;
   callback.Run(value);
 }
diff --git a/sync/notifier/fake_invalidator.h b/sync/notifier/fake_invalidator.h
index 43b9956..c94f82f 100644
--- a/sync/notifier/fake_invalidator.h
+++ b/sync/notifier/fake_invalidator.h
@@ -38,7 +38,8 @@ class FakeInvalidator : public Invalidator {
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+    base::Callback<void(const base::DictionaryValue&)> callback) const
+    OVERRIDE;
 
  private:
   InvalidatorRegistrar registrar_;
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index 0f2f4b7..2ae6079 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -74,7 +74,7 @@ void InvalidationNotifier::UpdateCredentials(
 }
 
 void InvalidationNotifier::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(CalledOnValidThread());
   invalidation_listener_.RequestDetailedStatus(callback);
 }
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index 444b952..3add4a8 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -59,7 +59,8 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> callback) const
+      OVERRIDE;
 
   // SyncInvalidationListener::Delegate implementation.
   virtual void OnInvalidate(
diff --git a/sync/notifier/invalidator.h b/sync/notifier/invalidator.h
index f934727..3c50fe6 100644
--- a/sync/notifier/invalidator.h
+++ b/sync/notifier/invalidator.h
@@ -81,7 +81,7 @@ class SYNC_EXPORT Invalidator {
 
   // Requests internal detailed status to be posted back to the callback.
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) = 0;
+      base::Callback<void(const base::DictionaryValue&)> callback) const = 0;
 };
 }  // namespace syncer
 
diff --git a/sync/notifier/invalidator_registrar_unittest.cc b/sync/notifier/invalidator_registrar_unittest.cc
index efd11d0..6614f96 100644
--- a/sync/notifier/invalidator_registrar_unittest.cc
+++ b/sync/notifier/invalidator_registrar_unittest.cc
@@ -52,7 +52,7 @@ class RegistrarInvalidator : public Invalidator {
   }
 
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> call) OVERRIDE {
+      base::Callback<void(const base::DictionaryValue&)> call) const OVERRIDE {
     // Do nothing.
   }
 
diff --git a/sync/notifier/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc
index d0a5a35..db8d018 100644
--- a/sync/notifier/non_blocking_invalidator.cc
+++ b/sync/notifier/non_blocking_invalidator.cc
@@ -107,7 +107,7 @@ class NonBlockingInvalidator::Core
   void UpdateRegisteredIds(const ObjectIdSet& ids);
   void UpdateCredentials(const std::string& email, const std::string& token);
   void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback);
+      base::Callback<void(const base::DictionaryValue&)> callback) const;
 
   // InvalidationHandler implementation (all called on I/O thread by
   // InvalidationNotifier).
@@ -177,7 +177,7 @@ void NonBlockingInvalidator::Core::UpdateCredentials(const std::string& email,
 }
 
 void NonBlockingInvalidator::Core::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   invalidation_notifier_->RequestDetailedStatus(callback);
 }
@@ -285,7 +285,7 @@ void NonBlockingInvalidator::UpdateCredentials(const std::string& email,
 }
 
 void NonBlockingInvalidator::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   base::Callback<void(const base::DictionaryValue&)> proxy_callback =
       base::Bind(&CallbackProxy::Run, base::Owned(new CallbackProxy(callback)));
diff --git a/sync/notifier/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h
index d32b4e3..47bd216 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/sync/notifier/non_blocking_invalidator.h
@@ -64,7 +64,8 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> callback) const
+      OVERRIDE;
 
   // InvalidationHandler implementation.
   virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
diff --git a/sync/notifier/p2p_invalidator.cc b/sync/notifier/p2p_invalidator.cc
index 2e11e24..f84f34e 100644
--- a/sync/notifier/p2p_invalidator.cc
+++ b/sync/notifier/p2p_invalidator.cc
@@ -203,7 +203,7 @@ void P2PInvalidator::UpdateCredentials(
 }
 
 void P2PInvalidator::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   // TODO(mferreria): Make the P2P Invalidator work.
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
diff --git a/sync/notifier/p2p_invalidator.h b/sync/notifier/p2p_invalidator.h
index 4e95747..07f46e72 100644
--- a/sync/notifier/p2p_invalidator.h
+++ b/sync/notifier/p2p_invalidator.h
@@ -110,7 +110,8 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback) OVERRIDE;
+      base::Callback<void(const base::DictionaryValue&)> callback) const
+      OVERRIDE;
 
   // PushClientObserver implementation.
   virtual void OnNotificationsEnabled() OVERRIDE;
diff --git a/sync/notifier/sync_invalidation_listener.cc b/sync/notifier/sync_invalidation_listener.cc
index c5dc8e3..231a5b78 100644
--- a/sync/notifier/sync_invalidation_listener.cc
+++ b/sync/notifier/sync_invalidation_listener.cc
@@ -361,7 +361,7 @@ void SyncInvalidationListener::DoRegistrationUpdate() {
 }
 
 void SyncInvalidationListener::RequestDetailedStatus(
-    base::Callback<void(const base::DictionaryValue&)> callback) {
+    base::Callback<void(const base::DictionaryValue&)> callback) const {
   DCHECK(CalledOnValidThread());
   sync_network_channel_->RequestDetailedStatus(callback);
   callback.Run(*CollectDebugData());
diff --git a/sync/notifier/sync_invalidation_listener.h b/sync/notifier/sync_invalidation_listener.h
index fddc208..aa332fb 100644
--- a/sync/notifier/sync_invalidation_listener.h
+++ b/sync/notifier/sync_invalidation_listener.h
@@ -137,7 +137,7 @@ class SYNC_EXPORT_PRIVATE SyncInvalidationListener
   void DoRegistrationUpdate();
 
   void RequestDetailedStatus(
-      base::Callback<void(const base::DictionaryValue&)> callback);
+      base::Callback<void(const base::DictionaryValue&)> callback) const;
 
   void StopForTest();