Fix //services/identity deps

Split //services/identity deps into deps and public_deps. Also, fix
include files and some build deps.

Bug: 970268
Change-Id: I74cfa6dd0b60dec8b1e8ea8236589dc89d1a8703
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1712872
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693626}

services/identity/BUILD.gn

@@ -18,9 +18,12 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//components/signin/public/base",
-    "//components/signin/public/identity_manager",
     "//google_apis",
+  ]
+
+  public_deps = [
+    "//components/signin/public/identity_manager",
+    "//mojo/public/cpp/bindings",
     "//services/identity/public/cpp:cpp_types",
     "//services/identity/public/mojom",
   ]
@@ -37,8 +40,9 @@ source_set("tests") {
     ":lib",
     "//base",
     "//base/test:test_support",
-    "//components/signin/public/base",
+    "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager:test_support",
+    "//google_apis",
     "//services/identity/public/cpp:cpp_types",
     "//services/identity/public/mojom",
     "//testing/gtest",

services/identity/identity_accessor_impl.cc

@@ -9,7 +9,10 @@
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "components/signin/public/identity_manager/access_token_info.h"
+#include "components/signin/public/identity_manager/account_info.h"
+#include "google_apis/gaia/core_account_id.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "services/identity/public/cpp/account_state.h"
 
 namespace identity {
 

services/identity/identity_accessor_impl.h

@@ -7,20 +7,22 @@
 
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
-#include "base/callback_list.h"
-#include "components/signin/public/identity_manager/account_info.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
-#include "google_apis/gaia/core_account_id.h"
-#include "services/identity/public/cpp/account_state.h"
 #include "services/identity/public/cpp/scope_set.h"
 #include "services/identity/public/mojom/identity_accessor.mojom.h"
 
+struct CoreAccountId;
+struct CoreAccountInfo;
+
 namespace signin {
 struct AccessTokenInfo;
 }
 
 namespace identity {
+struct AccountState;
 
 class IdentityAccessorImpl : public mojom::IdentityAccessor,
                              public signin::IdentityManager::Observer {

services/identity/identity_accessor_impl_unittest.cc

@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <string>
+
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "components/signin/public/identity_manager/account_info.h"
 #include "components/signin/public/identity_manager/identity_test_environment.h"
+#include "google_apis/gaia/core_account_id.h"
 #include "services/identity/identity_service.h"
 #include "services/identity/public/cpp/account_state.h"
 #include "services/identity/public/cpp/scope_set.h"

services/identity/identity_service.cc

@@ -4,10 +4,9 @@
 
 #include "services/identity/identity_service.h"
 
+#include <memory>
 #include <utility>
 
-#include "base/bind.h"
-#include "components/signin/public/identity_manager/identity_manager.h"
 #include "services/identity/identity_accessor_impl.h"
 
 namespace identity {

services/identity/identity_service.h

@@ -5,19 +5,21 @@
 #ifndef SERVICES_IDENTITY_IDENTITY_SERVICE_H_
 #define SERVICES_IDENTITY_IDENTITY_SERVICE_H_
 
-#include "components/signin/public/identity_manager/identity_manager.h"
+#include "base/macros.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/unique_receiver_set.h"
-#include "services/identity/public/mojom/identity_accessor.mojom.h"
 #include "services/identity/public/mojom/identity_service.mojom.h"
 
 namespace mojom {
 class IdentityAccessor;
 }
 
-namespace identity {
+namespace signin {
+class IdentityManager;
+}
 
+namespace identity {
 class IdentityService : public mojom::IdentityService {
  public:
   IdentityService(signin::IdentityManager* identity_manager,