Linux: fix a data race in a proxy config service unit test.

net/proxy/proxy_config_service_linux_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "net/proxy/proxy_config_service_linux.h"
 
@@ skipping 236 matching lines @@
   ~SynchConfigGetter() {
     // Let the config service post a destroy message to the IO thread
     // before cleaning up that thread.
     delete config_service_;
     // Clean up the IO thread.
     io_thread_.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         this, &SynchConfigGetter::Cleanup));
     Wait();
   }
 
-  // Does a reset, gconf setup and initial fetch of the proxy config,
+  // Does gconf setup and initial fetch of the proxy config,
   // all on the calling thread (meant to be the thread with the
   // default glib main loop, which is the UI thread).
   void SetupAndInitialFetch() {
     MessageLoop* file_loop = io_thread_.message_loop();
     DCHECK_EQ(MessageLoop::TYPE_IO, file_loop->type());
-    config_service_->Reset();
     // We pass the mock IO thread as both the IO and file threads.
     config_service_->SetupAndFetchInitialConfig(
         MessageLoop::current(), io_thread_.message_loop(),
         static_cast<MessageLoopForIO*>(file_loop));
   }
   // Synchronously gets the proxy config.
   int SyncGetProxyConfig(net::ProxyConfig* config) {
     io_thread_.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         this, &SynchConfigGetter::GetConfigOnIOThread));
     Wait();
@@ skipping 69 matching lines @@
   }
 
   FilePath kde_home_;
   FilePath kioslaverc_;
 };
 
 // Builds an identifier for each test in an array.
 #define TEST_DESC(desc) StringPrintf("at line %d <%s>", __LINE__, desc)
 
 TEST_F(ProxyConfigServiceLinuxTest, BasicGConfTest) {
-  MockEnvironmentVariableGetter* env_getter =
-      new MockEnvironmentVariableGetter;
-  MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
-  SynchConfigGetter sync_config_getter(
-      new ProxyConfigServiceLinux(env_getter, gconf_getter));
-
   std::vector<std::string> empty_ignores;
 
   std::vector<std::string> google_ignores;
   google_ignores.push_back("*.google.com");
 
   // Inspired from proxy_config_service_win_unittest.cc.
   // Very neat, but harder to track down failures though.
   const struct {
     // Short description to identify the test
     std::string description;
@@ skipping 218 matching lines @@
       false,                                          // auto_detect
       GURL(),                                         // pac_url
       MakeSingleProxyRules("www.google.com"),         // proxy_rules
       "*.google.com\n",                               // proxy_bypass_list
       false,                                          // bypass_local_names
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%d] %s", i, tests[i].description.c_str()));
+    MockEnvironmentVariableGetter* env_getter =
+        new MockEnvironmentVariableGetter;
+    MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
+    SynchConfigGetter sync_config_getter(
+        new ProxyConfigServiceLinux(env_getter, gconf_getter));
     ProxyConfig config;
     gconf_getter->values = tests[i].values;
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect);
     EXPECT_EQ(tests[i].pac_url, config.pac_url);
     EXPECT_EQ(tests[i].proxy_bypass_list,
               FlattenProxyBypass(config.proxy_bypass));
     EXPECT_EQ(tests[i].bypass_local_names, config.proxy_bypass_local_names);
     EXPECT_EQ(tests[i].proxy_rules, config.proxy_rules);
   }
 }
 
 TEST_F(ProxyConfigServiceLinuxTest, BasicEnvTest) {
-  MockEnvironmentVariableGetter* env_getter =
-      new MockEnvironmentVariableGetter;
-  MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
-  SynchConfigGetter sync_config_getter(
-      new ProxyConfigServiceLinux(env_getter, gconf_getter));
-
   // Inspired from proxy_config_service_win_unittest.cc.
   const struct {
     // Short description to identify the test
     std::string description;
 
     // Input.
     EnvVarValues values;
 
     // Expected outputs (fields of the ProxyConfig).
     bool auto_detect;
@@ skipping 239 matching lines @@
       GURL(),                     // pac_url
       MakeSingleProxyRules("www.google.com"),  // proxy_rules
       // proxy_bypass_list
       "*.google.com\n*foo.com:99\n1.2.3.4:22\n127.0.0.1/8\n",
       false,                        // bypass_local_names
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%d] %s", i, tests[i].description.c_str()));
+    MockEnvironmentVariableGetter* env_getter =
+        new MockEnvironmentVariableGetter;
+    MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
+    SynchConfigGetter sync_config_getter(
+        new ProxyConfigServiceLinux(env_getter, gconf_getter));
     ProxyConfig config;
     env_getter->values = tests[i].values;
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect);
     EXPECT_EQ(tests[i].pac_url, config.pac_url);
     EXPECT_EQ(tests[i].proxy_bypass_list,
               FlattenProxyBypass(config.proxy_bypass));
     EXPECT_EQ(tests[i].bypass_local_names, config.proxy_bypass_local_names);
@@ skipping 18 matching lines @@
 
   // Now set to auto-detect.
   gconf_getter->values.mode = "auto";
   // Simulate gconf notification callback.
   service->OnCheckProxyConfigSettings();
   sync_config_getter.SyncGetProxyConfig(&config);
   EXPECT_TRUE(config.auto_detect);
 }
 
 TEST_F(ProxyConfigServiceLinuxTest, KDEConfigParser) {
-  MockEnvironmentVariableGetter* env_getter =
-      new MockEnvironmentVariableGetter;
-  // Force the KDE getter to be used and tell it where the test is.
-  env_getter->values.DESKTOP_SESSION = "kde";
-  env_getter->values.KDE_HOME = kde_home_.value().c_str();
-  SynchConfigGetter sync_config_getter(new ProxyConfigServiceLinux(env_getter));
-
   // One of the tests below needs a worst-case long line prefix. We build it
   // programmatically so that it will always be the right size.
   std::string long_line;
   size_t limit = ProxyConfigServiceLinux::GConfSettingGetter::BUFFER_SIZE - 1;
   for (size_t i = 0; i < limit; ++i)
     long_line += "-";
 
   // Inspired from proxy_config_service_win_unittest.cc.
   const struct {
     // Short description to identify the test
@@ skipping 258 matching lines @@
       GURL(),                                      // pac_url
       MakeProxyPerSchemeRules("www.google.com",
                               "", "ftp.foo.com"),  // proxy_rules
       "",                                          // proxy_bypass_list
       false,                                       // bypass_local_names
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%d] %s", i, tests[i].description.c_str()));
+    MockEnvironmentVariableGetter* env_getter =
+        new MockEnvironmentVariableGetter;
+    // Force the KDE getter to be used and tell it where the test is.
+    env_getter->values.DESKTOP_SESSION = "kde";
+    env_getter->values.KDE_HOME = kde_home_.value().c_str();
+    SynchConfigGetter sync_config_getter(
+        new ProxyConfigServiceLinux(env_getter));
     ProxyConfig config;
     // Overwrite the kioslaverc file.
     file_util::WriteFile(kioslaverc_, tests[i].kioslaverc.c_str(),
                          tests[i].kioslaverc.length());
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect);
     EXPECT_EQ(tests[i].pac_url, config.pac_url);
     EXPECT_EQ(tests[i].proxy_bypass_list,
               FlattenProxyBypass(config.proxy_bypass));
     EXPECT_EQ(tests[i].bypass_local_names, config.proxy_bypass_local_names);
     EXPECT_EQ(tests[i].proxy_rules, config.proxy_rules);
   }
 }
 
 }  // namespace net