diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:50:44 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 21:50:44 +0000 |
| commit | 0dec72af4120aa512b877ec0ee01708b29611b48 (patch) | |
| tree | 11f9fda60a6207917e098248ba61f8429db53e13 | |
| parent | bc093e8eddc232add5229f4af7fdb3a956603914 (diff) | |
| download | chromium_src-0dec72af4120aa512b877ec0ee01708b29611b48.zip chromium_src-0dec72af4120aa512b877ec0ee01708b29611b48.tar.gz chromium_src-0dec72af4120aa512b877ec0ee01708b29611b48.tar.bz2 | |
Do not hardcode the Preferences filename in kiosk_browsertest.
BUG=343692
Review URL: https://codereview.chromium.org/185543007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254835 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/kiosk_browsertest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 43c7ef5..36f2148 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -26,6 +26,7 @@ #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_test_message_listener.h" +#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -472,8 +473,9 @@ class KioskTest : public OobeBaseTest { base::FilePath test_data_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)); test_data_dir = test_data_dir.AppendASCII(relative_app_profile_dir); - ASSERT_TRUE(base::CopyFile(test_data_dir.AppendASCII("Preferences"), - app_profile_dir.AppendASCII("Preferences"))); + ASSERT_TRUE( + base::CopyFile(test_data_dir.Append(chrome::kPreferencesFilename), + app_profile_dir.Append(chrome::kPreferencesFilename))); ASSERT_TRUE( base::CopyDirectory(test_data_dir.AppendASCII("Extensions"), app_profile_dir, |