Reverting 27389.

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 291 matching lines @@
   base::Thread io_thread_;
 
   net::ProxyConfigServiceLinux* config_service_;
 
   // The config obtained by |io_thread_| and read back by the main
   // thread.
   net::ProxyConfig proxy_config_;
   int get_config_result_;  // Return value from GetProxyConfig().
 };
 
-template<>
-void RunnableMethodTraits<SynchConfigGetter>::RetainCallee(
-    SynchConfigGetter* remover) {}
-template<>
-void RunnableMethodTraits<SynchConfigGetter>::ReleaseCallee(
-    SynchConfigGetter* remover) {}
+template <>
+struct RunnableMethodTraits<SynchConfigGetter> {
+  void RetainCallee(SynchConfigGetter*) {}
+  void ReleaseCallee(SynchConfigGetter*) {}
+};
 
 namespace net {
 
 // This test fixture is only really needed for the KDEConfigParser test case,
 // but all the test cases with the same prefix ("ProxyConfigServiceLinuxTest")
 // must use the same test fixture class (also "ProxyConfigServiceLinuxTest").
 class ProxyConfigServiceLinuxTest : public PlatformTest {
  protected:
   virtual void SetUp() {
     PlatformTest::SetUp();
@@ skipping 876 matching lines @@
     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