summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 07:44:10 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-17 07:44:10 +0000
commit02dbca0bce56a1ef5e53c8f446eef38df2f62e8f (patch)
treeb66a88c1611cb091fbf498d40c891f1672c1be02 /chrome/test
parent33f03e7856cee789c4a011e6736a9b3cf9f618a7 (diff)
downloadchromium_src-02dbca0bce56a1ef5e53c8f446eef38df2f62e8f.zip
chromium_src-02dbca0bce56a1ef5e53c8f446eef38df2f62e8f.tar.gz
chromium_src-02dbca0bce56a1ef5e53c8f446eef38df2f62e8f.tar.bz2
chromeos: implement persistence of proxy config to device, enhance unittest
- during storing, all info in proxy config is serialized into a dictionary and persisted to device via SignedSettings::StoragePropertyOp - during retrieving, value is retrieved from device via SignedSettings::RetrievePropertyOp and deserialized into proxy config - modify API to return bool when setting proxy config from UI - in DOMUI design, every interaction with the page triggers a call to update config in backend - but, sometimes, the info is incomplete, e.g. single-proxy checkbox is checked but proxy server is still empty - for such cases, config service caches the info (so that UI can get this info on the next Get), but doesn't activate or persist it, and returns false to UI - wrote unittests for configuring socks proxy and bypass rules, serialize and deserialize, update unittest for code changes - handle using stub implementation of libcros to make browser tests pass BUG=chromium_os:5127 TEST=as owner, modify proxy config from UI, log out or reboot device, verify that proxy config is updated. Review URL: http://codereview.chromium.org/3366028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/in_process_browser_test.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 24242a4..57d43fde 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -64,6 +64,10 @@ class LinuxHostInit {
} // namespace
#endif
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#endif // defined(OS_CHROMEOS)
+
extern int BrowserMain(const MainFunctionParams&);
const wchar_t kUnitTestShowWindows[] = L"show-windows";
@@ -192,6 +196,10 @@ void InProcessBrowserTest::SetUp() {
if (!tab_closeable_state_watcher_enabled_)
command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher);
+#if defined(OS_CHROMEOS)
+ chromeos::CrosLibrary::Get()->GetTestApi()->SetUseStubImpl();
+#endif // defined(OS_CHROMEOS)
+
SandboxInitWrapper sandbox_wrapper;
MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
params.ui_task =