diff options
| author | lukasza <lukasza@chromium.org> | 2015-08-07 17:36:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-08 00:37:12 +0000 |
| commit | 76b4a982964ffefeffa73af775f92d4c22d48791 (patch) | |
| tree | 6c832c9985a8f3e6d70528027cfdf5dc0320c4f7 /chrome/chrome_tests.gypi | |
| parent | 7a45b182edf6fc0e2e61e87b2a75653c88364184 (diff) | |
| download | chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.zip chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.gz chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.bz2 | |
Move a subset of chrome/browser/chromeos/drive into components/drive
Moved: drive_pref_names.*, drive_test_util.*, file_change.*,
file_error.*, local_file_reader.*
Other changes:
- Removed unnecessary include/dependency inside file_change.h
- ChromeOS if-def guards in drive_test_util.h
- Necessary DEPS tweaks
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. git cl try
TBR=satorux@chromium.org,benchan@chromium.org
TEST=Please see "Test steps" above.
BUG=257943, 498951
Review URL: https://codereview.chromium.org/1246753003
Cr-Commit-Position: refs/heads/master@{#342492}
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 481c3c7..2ed9098 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -530,8 +530,8 @@ 'browser/ui/webui/bidi_checker_web_ui_test.cc', 'browser/ui/webui/bidi_checker_web_ui_test.h', 'browser/ui/webui/bookmarks_ui_browsertest.cc', - 'browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h', 'browser/ui/webui/chrome_url_data_manager_browsertest.cc', + 'browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h', 'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc', 'browser/ui/webui/downloads_dom_handler_browsertest.cc', 'browser/ui/webui/downloads_ui_browsertest.cc', @@ -661,8 +661,6 @@ 'browser/chromeos/device/input_service_proxy_browsertest.cc', 'browser/chromeos/drive/drive_integration_service_browsertest.cc', 'browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc', - 'browser/chromeos/drive/drive_test_util.cc', - 'browser/chromeos/drive/drive_test_util.h', 'browser/chromeos/extensions/accessibility_features_apitest.cc', 'browser/chromeos/extensions/echo_private_apitest.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc', @@ -677,22 +675,22 @@ 'browser/chromeos/extensions/wallpaper_manager_browsertest.cc', 'browser/chromeos/extensions/wallpaper_private_apitest.cc', 'browser/chromeos/file_manager/audio_player_browsertest.cc', - 'browser/chromeos/file_manager/gallery_browsertest.cc', 'browser/chromeos/file_manager/external_filesystem_apitest.cc', + 'browser/chromeos/file_manager/file_manager_browsertest.cc', 'browser/chromeos/file_manager/file_manager_browsertest_base.cc', 'browser/chromeos/file_manager/file_manager_browsertest_base.h', - 'browser/chromeos/file_manager/file_manager_browsertest.cc', 'browser/chromeos/file_manager/file_manager_jstest.cc', 'browser/chromeos/file_manager/file_manager_jstest_base.cc', 'browser/chromeos/file_manager/file_manager_jstest_base.h', + 'browser/chromeos/file_manager/gallery_browsertest.cc', + 'browser/chromeos/file_manager/gallery_jstest.cc', + 'browser/chromeos/file_manager/image_loader_jstest.cc', 'browser/chromeos/file_manager/mount_test_util.cc', 'browser/chromeos/file_manager/mount_test_util.h', 'browser/chromeos/file_manager/video_player_browsertest.cc', - 'browser/chromeos/file_manager/gallery_jstest.cc', - 'browser/chromeos/file_manager/image_loader_jstest.cc', 'browser/chromeos/file_manager/zip_file_creator_browsertest.cc', - 'browser/chromeos/first_run/drive_first_run_browsertest.cc', 'browser/chromeos/first_run/chromeos_first_run_browsertest.cc', + 'browser/chromeos/first_run/drive_first_run_browsertest.cc', 'browser/chromeos/input_method/input_method_engine_browsertests.cc', 'browser/chromeos/input_method/mode_indicator_browsertest.cc', 'browser/chromeos/login/crash_restore_browsertest.cc', @@ -2265,6 +2263,7 @@ 'dependencies': [ '../dbus/dbus.gyp:dbus_test_support', '../build/linux/system.gyp:dbus', + '../components/components.gyp:drive_test_support', '../ui/login/login.gyp:login_resources', ], }, { # Non-ChromeOS |