Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: net/proxy/proxy_config_service_linux.h

Issue 214036: Linux: fix a data race in a proxy config service unit test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux.h
===================================================================
--- net/proxy/proxy_config_service_linux.h (revision 26750)
+++ net/proxy/proxy_config_service_linux.h (working copy)
@@ -33,6 +33,7 @@
// files. Defined here so unit tests can construct worst-case inputs.
static const size_t BUFFER_SIZE = 512;
+ GConfSettingGetter() {}
virtual ~GConfSettingGetter() {}
// Initializes the class: obtains a gconf client, or simulates one, in
@@ -74,6 +75,9 @@
// And for a string list.
virtual bool GetStringList(const char* key,
std::vector<std::string>* result) = 0;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(GConfSettingGetter);
};
// ProxyConfigServiceLinux is created on the UI thread, and
@@ -117,10 +121,6 @@
void SetupAndFetchInitialConfig(MessageLoop* glib_default_loop,
MessageLoop* io_loop,
MessageLoopForIO* file_loop);
- // Resets cached_config_ and releases the gconf_getter_, making it
- // possible to call SetupAndFetchInitialConfig() again. Only used
- // in testing.
- void Reset();
// Handler for gconf change notifications: fetches a new proxy
// configuration from gconf settings, and if this config is
@@ -214,9 +214,6 @@
delegate_->SetupAndFetchInitialConfig(glib_default_loop, io_loop,
file_loop);
}
- void Reset() {
- delegate_->Reset();
- }
void OnCheckProxyConfigSettings() {
delegate_->OnCheckProxyConfigSettings();
}
« no previous file with comments | « no previous file | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698