Fix policy invalidator lifecycle bugs for Android.

chrome/browser/policy/cloud/DEPS

 # The //chrome/browser/policy code is being converted into a component at
 # //components/policy. This DEPS file is temporarily restricting the include
 # rules for this code; once all the exceptions are fixed then the code will
 # be moved, and this file will be removed.
 # http://crbug.com/271392
 
 include_rules = [
   "-chrome",
   "-chromeos",
   "-content",
@@ skipping 39 matching lines @@
     "+chrome/common/chrome_switches.h",
   ],
 
   r"cloud_policy_core_unittest\.cc": [
     "+chrome/browser/prefs/browser_prefs.h",
     "+chrome/common/pref_names.h",
   ],
 
   r"cloud_policy_invalidator\.cc": [
     "+chrome/browser/invalidation/invalidation_service.h",
-    "+chrome/browser/invalidation/invalidation_service_factory.h",
     "+chrome/common/chrome_switches.h",
   ],
 
   r"cloud_policy_invalidator_unittest\.cc": [
     "+chrome/browser/invalidation/fake_invalidation_service.h",
   ],
 
   r"cloud_policy_manager_unittest\.cc": [
     "+chrome/browser/invalidation/fake_invalidation_service.h",
   ],
@@ skipping 40 matching lines @@
   ],
 
   r"test_request_interceptor\.cc": [
     "+content/public/browser/browser_thread.h",
     "+content/public/test/test_utils.h",
     "+content/test/net/url_request_mock_http_job.h",
   ],
 
   r"user_cloud_policy_invalidator\.cc": [
     "+chrome/browser/chrome_notification_types.h",
+    "+chrome/browser/invalidation/invalidation_service_factory.h",
     "+content/public/browser/notification_source.h",
   ],
 
   r"user_cloud_policy_invalidator_factory\.cc": [
     "+chrome/browser/invalidation/invalidation_service_factory.h",
     "+chrome/browser/profiles/profile.h",
     "+chrome/common/chrome_switches.h",
     "+chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h",
     "+chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h",
   ],
@@ skipping 21 matching lines @@
 
   r"user_cloud_policy_store_unittest\.cc": [
     "+chrome/browser/signin/fake_signin_manager.h",
     "+chrome/browser/signin/signin_manager.h",
     "+chrome/browser/signin/signin_manager_factory.h",
     "+chrome/common/pref_names.h",
     "+chrome/test/base/testing_profile.h",
     "+content/public/test/test_browser_thread.h",
   ],
 }