diff options
author | lukasza <lukasza@chromium.org> | 2015-08-20 18:13:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 01:13:59 +0000 |
commit | 6364a0299330a1ac060f0794f4638f82c0dc5cc2 (patch) | |
tree | 38c2645500cb3be95f73187aaa211f210dd3ce1a /chrome/browser/chromeos/drive/write_on_cache_file.cc | |
parent | 85cc8532e314967a8ec308bc7fed379f3ad9d80a (diff) | |
download | chromium_src-6364a0299330a1ac060f0794f4638f82c0dc5cc2.zip chromium_src-6364a0299330a1ac060f0794f4638f82c0dc5cc2.tar.gz chromium_src-6364a0299330a1ac060f0794f4638f82c0dc5cc2.tar.bz2 |
Move chrome/browser/chromeos/drive/resource* (+deps) into components/drive.
Files moved from chrome/browser/chromeos/drive into components/drive:
- fake_free_disk_space_getter*
- file_cache*
- file_system_core_util*
- resource_entry_conversion*
- resource_metadata*
- resource_metadata_storage*
Other changes:
- Removed unneeded includes where needed and possible.
- Hidden usage of cryptohome::kMinFreeSpaceInBytes behind OS_CHROMEOS ifdefs
and provided an equivalent constant shared by other OS-es.
- Hidden usage of base::SetPosixFilePermissions behind OS_CHROMEOS ifdef
as it was only needed to support cros_disks service on ChromeOS.
- Moved 3 functions back from file_system_core_util into file_system_core.
The 3 functions are ChromeOS-specific (dealing with where GDrive is mounted
on ChromeOS) and moving them back helps avoid adding a new dependency on
components/drive from chromeos directories.
- When adding a third_party/leveldatabase dependency to gyp/gn/deps files
under components/drive, I realized that gn is not consistent with gyp, by
not explicitly listing a dependency on third_party/cacheinvalidation in
components/drive/BUILD.gn.
Test steps:
1. Verify that things still build via GYP (and unit tests pass).
$ GYP_DEFINES="use_goma=1 gomadir=... chromeos=1" gclient sync
$ ninja -C out/Debug -j 150 chrome unit_tests \
interactive_ui_tests browser_tests drive
$ out/Debug/unit_tests
2. Verify that things still build via GN.
$ gn gen out/Default --args='target_os="chromeos" use_goma=true'
$ ninja -C out/Default -j 150 chrome unit_tests \
interactive_ui_tests browser_tests components/drive
TEST=Please see "Test steps" above.
BUG=257943, 498951
TBR=mtomasz@chromium.org, satorux@chromium.org, phajdan.jr@chromium.org, rockot@chromium.org, stevenjb@chromium.org,
Review URL: https://codereview.chromium.org/1296483003
Cr-Commit-Position: refs/heads/master@{#344637}
Diffstat (limited to 'chrome/browser/chromeos/drive/write_on_cache_file.cc')
-rw-r--r-- | chrome/browser/chromeos/drive/write_on_cache_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/drive/write_on_cache_file.cc b/chrome/browser/chromeos/drive/write_on_cache_file.cc index 2a15a79..bcfb30a 100644 --- a/chrome/browser/chromeos/drive/write_on_cache_file.cc +++ b/chrome/browser/chromeos/drive/write_on_cache_file.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/threading/sequenced_worker_pool.h" -#include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" +#include "components/drive/file_system_core_util.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; |