diff options
| author | satorux <satorux@chromium.org> | 2014-10-30 01:23:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 08:23:31 +0000 |
| commit | 8fd29380c9f675f931121080c22a4fef520140f5 (patch) | |
| tree | a91b01ba36a6e16e1b5a3913f8a1b374d0dbc753 /chromeos/chromeos.gyp | |
| parent | e91d66a75efc4b9d0df35d9edf5d6e9be5b39e6a (diff) | |
| download | chromium_src-8fd29380c9f675f931121080c22a4fef520140f5.zip chromium_src-8fd29380c9f675f931121080c22a4fef520140f5.tar.gz chromium_src-8fd29380c9f675f931121080c22a4fef520140f5.tar.bz2 | |
Merge CrosDisksClientStubImpl into FakeCrosDisksClient
Move the fake mounting logic from CrosDisksClientStubImpl
to FakeCrosDsisksClient, with some simplification.
The fake behaviors are used in FileManagerBrowserTest's
OpenZipFiles test. The test is currently disabled for
a performance reason, but I've confirmed that the test
passes with --gtest_also_run_disabled_tests.
TEST=out/Release/browser_tests --gtest_filter='*OpenZipFiles*' --gtest_also_run_disabled_tests
BUG=309506
Review URL: https://codereview.chromium.org/676423004
Cr-Commit-Position: refs/heads/master@{#302053}
Diffstat (limited to 'chromeos/chromeos.gyp')
| -rw-r--r-- | chromeos/chromeos.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 20e9622..0fb9748 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -122,6 +122,8 @@ 'dbus/fake_bluetooth_profile_service_provider.h', 'dbus/fake_cras_audio_client.cc', 'dbus/fake_cras_audio_client.h', + 'dbus/fake_cros_disks_client.cc', + 'dbus/fake_cros_disks_client.h', 'dbus/fake_cryptohome_client.cc', 'dbus/fake_cryptohome_client.h', 'dbus/fake_debug_daemon_client.cc', @@ -574,8 +576,6 @@ ], # If you edit the file list of this target, please edit BUILD.gn as well. 'sources': [ - 'dbus/fake_cros_disks_client.cc', - 'dbus/fake_cros_disks_client.h', 'dbus/fake_power_manager_client.cc', 'dbus/fake_power_manager_client.h', 'dbus/fake_session_manager_client.cc', |