cros: CustomFrameViewAsh avatar icon from a window prop

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 2aac0792f7960ec7c06a40b98d71454eb5437a41..3ee2bb32624f3cff75262cda749822a7a1c590da 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -58,7 +59,6 @@ class AshTestViewsDelegate;
 class TestScreenshotDelegate;
 class TestShellDelegate;
 class TestSessionControllerClient;
-class TestSessionStateDelegate;
 
 // A helper class that does common initialization required for Ash. Creates a
 // root window and an ash::Shell instance with a test delegate.
@@ -85,8 +85,6 @@ class AshTestHelper {
 
   void RunAllPendingInMessageLoop();
 
-  static TestSessionStateDelegate* GetTestSessionStateDelegate();
-
   TestShellDelegate* test_shell_delegate() { return test_shell_delegate_; }
   void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) {
     test_shell_delegate_ = test_shell_delegate;