chrome: Remove 11 exit time destructors and 4 static initializers.

chrome/browser/net/network_stats.cc

 // Copyright (c) 2011 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 "chrome/browser/net/network_stats.h"
 
 #include "base/callback_old.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 521 matching lines @@
             &CollectNetworkStats, network_stats_server, io_thread));
     return;
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Check that there is a network connection. We get called only if UMA upload
   // to the server has succeeded.
   DCHECK(!net::NetworkChangeNotifier::IsOffline());
 
-  static scoped_refptr<base::FieldTrial> trial = NULL;
+  CR_DEFINE_STATIC_LOCAL(scoped_refptr<base::FieldTrial>, trial, (NULL));

[Mark Mentovai, 2011/11/16 22:54:24]

You can use () instead of (NULL) here.

[Nico, 2011/11/16 22:59:20]

Done.

   static bool collect_stats = false;
 
   if (!trial.get()) {
     // Set up a field trial to collect network stats for UDP and TCP.
     base::FieldTrial::Probability kDivisor = 1000;
 
     // Enable the connectivity testing for 0.5% of the users.
     base::FieldTrial::Probability kProbabilityPerGroup = 5;
 
     // After October 30, 2011 builds, it will always be in default group
@@ skipping 43 matching lines @@
   TCPStatsClient* small_tcp_client = new TCPStatsClient();
   small_tcp_client->Start(
       host_resolver, tcp_server_address, kSmallTestBytesToSend, NULL);
 
   TCPStatsClient* large_tcp_client = new TCPStatsClient();
   large_tcp_client->Start(
       host_resolver, tcp_server_address, kLargeTestBytesToSend, NULL);
 }
 
 }  // namespace chrome_browser_net