Chromium Code Reviews| Index: ash/test/ash_test_environment_content.cc |
| diff --git a/ash/test/ash_test_environment_content.cc b/ash/test/ash_test_environment_content.cc |
| index 0e5123730ab39b6f5872b57c62ce53e0675b75ed..ae706cf5557c98e46df1f475fed46eba29735b78 100644 |
| --- a/ash/test/ash_test_environment_content.cc |
| +++ b/ash/test/ash_test_environment_content.cc |
| @@ -6,10 +6,13 @@ |
| #include "ash/test/ash_test_views_delegate.h" |
| #include "ash/test/content/test_shell_content_state.h" |
| +#include "base/files/file_path.h" |
|
msw
2016/09/06 23:30:02
nit: cleanup these three new includes.
sky
2016/09/06 23:47:32
Done.
|
| #include "base/memory/ptr_util.h" |
| +#include "base/path_service.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/test/test_browser_thread_bundle.h" |
| #include "content/public/test/web_contents_tester.h" |
| +#include "ui/base/resource/resource_bundle.h" |
| namespace ash { |
| namespace test { |
| @@ -39,6 +42,11 @@ std::unique_ptr<AshTestEnvironment> AshTestEnvironment::Create() { |
| return base::MakeUnique<AshTestEnvironmentContent>(); |
| } |
| +// static |
| +std::string AshTestEnvironment::Get100PercentResourceFileName() { |
| + return "ash_test_resources_with_content_100_percent.pak"; |
| +} |
| + |
| AshTestEnvironmentContent::AshTestEnvironmentContent() |
| : thread_bundle_(base::MakeUnique<content::TestBrowserThreadBundle>()) {} |