| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "apps/saved_files_service.h" | 5 #include "apps/saved_files_service.h" |
| 6 #include "base/files/file_util.h" | 6 #include "base/files/file_util.h" |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/scoped_observer.h" | 9 #include "base/scoped_observer.h" |
| 10 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "chrome/browser/apps/app_browsertest_util.h" | 12 #include "chrome/browser/apps/app_browsertest_util.h" |
| 13 #include "chrome/browser/extensions/api/file_system/file_system_api.h" | |
| 14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 15 #include "extensions/browser/api/file_system/file_system_api.h" |
| 16 #include "extensions/browser/extension_prefs.h" | 16 #include "extensions/browser/extension_prefs.h" |
| 17 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" |
| 18 #include "extensions/browser/extension_registry_observer.h" | 18 #include "extensions/browser/extension_registry_observer.h" |
| 19 | 19 |
| 20 // TODO(michaelpg): Port these tests to app_shell: crbug.com/505926. |
| 21 |
| 20 namespace content { | 22 namespace content { |
| 21 class BrowserContext; | 23 class BrowserContext; |
| 22 } | 24 } |
| 23 | 25 |
| 24 namespace extensions { | 26 namespace extensions { |
| 25 | 27 |
| 26 namespace { | 28 namespace { |
| 27 | 29 |
| 28 class AppLoadObserver : public ExtensionRegistryObserver { | 30 class AppLoadObserver : public ExtensionRegistryObserver { |
| 29 public: | 31 public: |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 #if !defined(OS_CHROMEOS) | 673 #if !defined(OS_CHROMEOS) |
| 672 IN_PROC_BROWSER_TEST_F(FileSystemApiTest, RequestFileSystem_NotChromeOS) { | 674 IN_PROC_BROWSER_TEST_F(FileSystemApiTest, RequestFileSystem_NotChromeOS) { |
| 673 ASSERT_TRUE(RunPlatformAppTestWithFlags( | 675 ASSERT_TRUE(RunPlatformAppTestWithFlags( |
| 674 "api_test/file_system/request_file_system_not_chromeos", | 676 "api_test/file_system/request_file_system_not_chromeos", |
| 675 kFlagIgnoreManifestWarnings)) | 677 kFlagIgnoreManifestWarnings)) |
| 676 << message_; | 678 << message_; |
| 677 } | 679 } |
| 678 #endif | 680 #endif |
| 679 | 681 |
| 680 } // namespace extensions | 682 } // namespace extensions |
| OLD | NEW |