Remove chromeos/cryptohome DEPS from chromeos/dbus

This dependency is no longer required, this CL just cleans up some
includes and makes a minor change to
FakeAuthPolicyClient::RefreshUserPolicy to remove the cryptohome
dependency and support tests.

For minor fix to chrome/browser/chromeos/policy/ includes:
TBR=emaxx@chromium.org

Bug: 863439
Change-Id: I519ea33d7e5ad9355c45bfc172f97a4cb51b8122
Reviewed-on: https://chromium-review.googlesource.com/1165491
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581611}

chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc

@@ -23,6 +23,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "components/ownership/mock_owner_key_util.h"

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

@@ -49,6 +49,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"

chrome/browser/chromeos/login/users/wallpaper_policy_browsertest.cc

@@ -36,6 +36,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"

chrome/browser/chromeos/policy/component_active_directory_policy_browsertest.cc

@@ -14,6 +14,7 @@
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"

chromeos/dbus/DEPS

@@ -3,8 +3,6 @@ noparent = True
 include_rules = [
   "+base",
   "+chromeos/chromeos_export.h",
-  # TODO(stevenjb): Fix this. https://crbug.com/863439
-  "+chromeos/cryptohome",
   "+components/account_id/account_id.h",
   "+components/device_event_log",
   "+components/policy/proto",

chromeos/dbus/cryptohome_client.cc

@@ -18,7 +18,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/optional.h"
-#include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/blocking_method_caller.h"
 #include "chromeos/dbus/cryptohome/key.pb.h"
 #include "chromeos/dbus/cryptohome/rpc.pb.h"

chromeos/dbus/fake_auth_policy_client.cc

@@ -8,17 +8,13 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/md5.h"
-#include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chromeos/chromeos_paths.h"
-#include "chromeos/cryptohome/cryptohome_parameters.h"
+#include "chromeos/dbus/cryptohome/rpc.pb.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ -227,9 +223,10 @@ void FakeAuthPolicyClient::RefreshUserPolicy(const AccountId& account_id,
   em::PolicyFetchResponse response;
   response.set_policy_data(policy_data.SerializeAsString());
 
+  cryptohome::AccountIdentifier account_identifier;
+  account_identifier.set_account_id(account_id.GetAccountIdKey());
   session_manager_client->StorePolicyForUser(
-      cryptohome::CreateAccountIdentifierFromAccountId(account_id),
-      response.SerializeAsString(),
+      account_identifier, response.SerializeAsString(),
       base::BindOnce(&OnStorePolicy, std::move(callback)));
 }
 

chromeos/dbus/fake_cryptohome_client.h

@@ -17,7 +17,6 @@
 #include "base/observer_list.h"
 #include "base/optional.h"
 #include "base/timer/timer.h"
-#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome/key.pb.h"
 #include "chromeos/dbus/cryptohome/rpc.pb.h"
 #include "chromeos/dbus/cryptohome_client.h"

chromeos/dbus/fake_cryptohome_client_unittest.cc

@@ -11,7 +11,6 @@
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "base/test/scoped_task_environment.h"
-#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/attestation/attestation.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chromeos/dbus/fake_session_manager_client.h

@@ -13,7 +13,6 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/login_manager/arc.pb.h"
 #include "chromeos/dbus/session_manager_client.h"
 

chromeos/dbus/session_manager_client.cc

@@ -21,8 +21,8 @@
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/blocking_method_caller.h"
+#include "chromeos/dbus/cryptohome/rpc.pb.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/login_manager/arc.pb.h"