diff options
| author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 12:28:59 +0000 |
|---|---|---|
| committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 12:28:59 +0000 |
| commit | 56b0f33a9e7d7107ecab6986b8cdfdf5952cac38 (patch) | |
| tree | 79c55cdd54b5cfe935a3b95d256e913ce9b1f60a /chrome/chrome_tests.gypi | |
| parent | 40c610a6f0c9304d16b4aabeddfc2f886eeb175f (diff) | |
| download | chromium_src-56b0f33a9e7d7107ecab6986b8cdfdf5952cac38.zip chromium_src-56b0f33a9e7d7107ecab6986b8cdfdf5952cac38.tar.gz chromium_src-56b0f33a9e7d7107ecab6986b8cdfdf5952cac38.tar.bz2 | |
Merge 64241 - Store settings that should be signed in temporary place before owner is assigned.
Make proxy settings work on welcome screen in chromium OS.
BUG=http://crosbug.com/3062
TEST=Manual
Review URL: http://codereview.chromium.org/3860001
TBR=dilmah@chromium.org
Review URL: http://codereview.chromium.org/4090009
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 29d8f02..42c7b6f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1062,6 +1062,7 @@ 'browser/chromeos/login/parallel_authenticator_unittest.cc', 'browser/chromeos/login/signed_settings_unittest.cc', 'browser/chromeos/login/signed_settings_helper_unittest.cc', + 'browser/chromeos/login/signed_settings_temp_storage_unittest.cc', 'browser/chromeos/login/wizard_accessibility_handler_unittest.cc', 'browser/chromeos/notifications/desktop_notifications_unittest.cc', 'browser/chromeos/offline/offline_load_page_unittest.cc', |