OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/test/ash_test_environment_content.h" | 5 #include "ash/test/ash_test_environment_content.h" |
6 | 6 |
7 #include "ash/test/ash_test_views_delegate.h" | 7 #include "ash/test/ash_test_views_delegate.h" |
8 #include "ash/test/content/test_shell_content_state.h" | 8 #include "ash/test/content/test_shell_content_state.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 } | 59 } |
60 | 60 |
61 void AshTestEnvironmentContent::TearDown() { | 61 void AshTestEnvironmentContent::TearDown() { |
62 ShellContentState::DestroyInstance(); | 62 ShellContentState::DestroyInstance(); |
63 } | 63 } |
64 | 64 |
65 base::SequencedWorkerPool* AshTestEnvironmentContent::GetBlockingPool() { | 65 base::SequencedWorkerPool* AshTestEnvironmentContent::GetBlockingPool() { |
66 return content::BrowserThread::GetBlockingPool(); | 66 return content::BrowserThread::GetBlockingPool(); |
67 } | 67 } |
68 | 68 |
69 std::unique_ptr<views::ViewsDelegate> | 69 std::unique_ptr<AshTestViewsDelegate> |
70 AshTestEnvironmentContent::CreateViewsDelegate() { | 70 AshTestEnvironmentContent::CreateViewsDelegate() { |
71 return base::MakeUnique<AshTestViewsDelegateContent>(); | 71 return base::MakeUnique<AshTestViewsDelegateContent>(); |
72 } | 72 } |
73 | 73 |
74 } // namespace test | 74 } // namespace test |
75 } // namespace ash | 75 } // namespace ash |
OLD | NEW |