Stop including oauth2_token_service_observer.h from identity_manager.h

Don't include that internal header from identity_manager.h (which is
public) and simply include oauth2_token_service_observer.h instead,
which does not pose any problem since the methods that will allow
adding / remover O2TS observers will not be exposed publicly anyway.

Bug: 967619
Change-Id: I0f31eca66a2ad56669f78bc201c09125364a66a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1660344Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#669997}

chrome/browser/signin/identity_manager_factory.cc

@@ -22,6 +22,7 @@
 #include "components/signin/core/browser/identity_manager_wrapper.h"
 #include "components/signin/core/browser/primary_account_manager.h"
 #include "components/signin/core/browser/primary_account_policy_manager_impl.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "services/identity/public/cpp/accounts_cookie_mutator.h"
 #include "services/identity/public/cpp/accounts_cookie_mutator_impl.h"

components/signin/core/browser/identity_manager_wrapper.cc

@@ -8,6 +8,7 @@
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "services/identity/public/cpp/accounts_cookie_mutator.h"
 #include "services/identity/public/cpp/accounts_mutator.h"
 #include "services/identity/public/cpp/diagnostics_provider.h"

services/identity/public/cpp/DEPS

@@ -21,6 +21,7 @@ include_rules = [
   "+google_apis/gaia/oauth2_access_token_consumer.h",
   "+google_apis/gaia/oauth2_token_service.h",
   "+google_apis/gaia/oauth2_token_service_delegate.h",
+  "+google_apis/gaia/oauth2_token_service_observer.h",
   "+services/network/public/cpp",
 ]
 

services/identity/public/cpp/identity_manager.cc

@@ -10,6 +10,7 @@
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
+#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/ubertoken_fetcher_impl.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "services/identity/public/cpp/accounts_cookie_mutator.h"

services/identity/public/cpp/identity_manager.h

@@ -12,9 +12,9 @@
 #include "build/build_config.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/primary_account_manager.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/browser/ubertoken_fetcher.h"
+#include "google_apis/gaia/oauth2_token_service_observer.h"
 #include "services/identity/public/cpp/access_token_fetcher.h"
 #include "services/identity/public/cpp/accounts_in_cookie_jar_info.h"
 #include "services/identity/public/cpp/scope_set.h"
@@ -35,6 +35,7 @@ class SigninManagerAndroid;
 class AccountFetcherService;
 class AccountTrackerService;
 class GaiaCookieManagerService;
+class ProfileOAuth2TokenService;
 
 namespace identity {