Ensure WeakPtrFactories are at the end of their owning classes and refer

chrome/browser/intranet_redirect_detector.cc

 // Copyright (c) 2012 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/intranet_redirect_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 const size_t IntranetRedirectDetector::kNumCharsInHostnames = 10;
 
 IntranetRedirectDetector::IntranetRedirectDetector()
     : redirect_origin_(g_browser_process->local_state()->GetString(
           prefs::kLastKnownIntranetRedirectOrigin)),
-      weak_factory_(this),
-      in_sleep_(true) {
+      in_sleep_(true),
+      weak_ptr_factory_(this) {
   // Because this function can be called during startup, when kicking off a URL
   // fetch can eat up 20 ms of time, we delay seven seconds, which is hopefully
   // long enough to be after startup, but still get results back quickly.
   // Ideally, instead of this timer, we'd do something like "check if the
   // browser is starting up, and if so, come back later", but there is currently
   // no function to do this.
   static const int kStartFetchDelaySeconds = 7;
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&IntranetRedirectDetector::FinishSleep,
-                 weak_factory_.GetWeakPtr()),
+                 weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(kStartFetchDelaySeconds));
 
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
 }
 
 IntranetRedirectDetector::~IntranetRedirectDetector() {
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
   STLDeleteElements(&fetchers_);
 }
 
@@ skipping 103 matching lines @@
   // If a request is already scheduled, do not scheduled yet another one.
   if (in_sleep_)
     return;
 
   // Since presumably many programs open connections after network changes,
   // delay this a little bit.
   in_sleep_ = true;
   static const int kNetworkSwitchDelayMS = 1000;
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&IntranetRedirectDetector::FinishSleep,
-                 weak_factory_.GetWeakPtr()),
+                 weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kNetworkSwitchDelayMS));
 }
 
 IntranetRedirectHostResolverProc::IntranetRedirectHostResolverProc(
     net::HostResolverProc* previous)
     : net::HostResolverProc(previous) {
 }
 
 int IntranetRedirectHostResolverProc::Resolve(
     const std::string& host,
     net::AddressFamily address_family,
     net::HostResolverFlags host_resolver_flags,
     net::AddressList* addrlist,
     int* os_error) {
   // We'd love to just ask the IntranetRedirectDetector, but we may not be on
   // the same thread.  So just use the heuristic that any all-lowercase a-z
   // hostname with the right number of characters is likely from the detector
   // (and thus should be blocked).
   return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) &&
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
       ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist,
                            os_error);
 }