summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 02:26:07 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-04 02:26:07 +0000
commit6f96cbcbd242db55cac30552d82472ecf6bf383d (patch)
tree69fa35f4ae5723946f14905007d91afe889d7ea1 /chrome/chrome_tests.gypi
parent5946838ef91d54c07e4cf2c345b61ae7eb6db064 (diff)
downloadchromium_src-6f96cbcbd242db55cac30552d82472ecf6bf383d.zip
chromium_src-6f96cbcbd242db55cac30552d82472ecf6bf383d.tar.gz
chromium_src-6f96cbcbd242db55cac30552d82472ecf6bf383d.tar.bz2
redesign and reimplement proxy config service and tracker, revise proxy ui on cros
* original plan was to revise proxy ui on cros for all proxy sources and network types, refer to bug rpt 21219 for ui details * redesign and reimplement PrefProxyConfigTracker and PrefProxyConfigService by switching the inter-dependencies between the two and renaming the latter - PrefProxyConfigService used to observe PrefProxyConfigTracker and retrieve new prefs proxy from the latter whenever the former gets notification of proxy change from prefs or delegate service to determine effective proxy config. Now, PrefProxyConfigTracker pushes new prefs proxy to the renamed ChromeProxyConfigService on the IO thread; the latter then uses it and proxy from delegate service to determine effective proxy config. - remove all thread-switching in PrefProxyConfigTracker which now lives and runs on UI thread, except for when it pushes proxy config to ChromeProxyConfigService on IO thread - enhances and moves ConfigState definition to namespace ProxyPrefs to indicate source of proxy config (policy, extension, other-precede, system, fallback) so that PrefProxyConfigTracker, ChromeProxyConfigService and chromeos::ProxyConfigServiceImpl can acccess it - extract code for deciding effective proxy config from PrefProxyConfigService into static PrefProxyConfigTracker method to be shared by all classes * re-design and re-implement chromeos::ProxyConfigServiceImpl - this now extends PrefProxyConfigTracker to act as a special of "prefs", handles all proxy changes from network and prefs notifications and uses PrefProxyConfigTracker to push effective proxy to ChromeProxyConfigService and hence to network stack - remove wrapper chromeos::ProxyConfigService - this is the authority on cros, and ChromeProxyConfigService does not have a delegat service. - provide proxy config to ui for all proxy sources: policy, extension, network or recommended (in order of precedence), also indicates if proxy is user-modifiable - handle user profile changes to use correct PrefProxyConfigTracker * modify CoreOptionsHandler and CoreChromeosOptionsHandler to implement dynamic monitoring of prefs::kProxy and on-the-fly ui changes of affected use-shared-proxies user pref * modify ui native code, html, css and javascript for internet options and proxy pages to show yellow banner with different messages (same banner as options page when there's policy), en/dis-able ui fields, set current user profile in backend * modify network dropdown menu to always show proxy settings menu item as long as there's a network * modify automation tests, PrefProxyConfigTracker and ProxyConfigSerivceImpl unittests to handle redesign, fix unittests that fail due to redesign BUG=chromium-os:20679,chromium-os:21219 TEST=verify per bugs rpts Review URL: http://codereview.chromium.org/8102019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5a2b86c..e86c146 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1426,7 +1426,7 @@
'browser/net/network_stats_unittest.cc',
'browser/net/passive_log_collector_unittest.cc',
'browser/net/predictor_unittest.cc',
- 'browser/net/pref_proxy_config_service_unittest.cc',
+ 'browser/net/pref_proxy_config_tracker_impl_unittest.cc',
'browser/net/quoted_printable_unittest.cc',
'browser/net/sqlite_origin_bound_cert_store_unittest.cc',
'browser/net/sqlite_persistent_cookie_store_unittest.cc',