Miscellaneous cleanups from several months ago I never got around to landing.

chrome/browser/alternate_nav_url_fetcher.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/alternate_nav_url_fetcher.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/link_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/intranet_redirect_detector.h"
@@ skipping 166 matching lines @@
     const net::URLFetcher* source) {
   DCHECK_EQ(fetcher_.get(), source);
   SetStatusFromURLFetch(
       source->GetURL(), source->GetStatus(), source->GetResponseCode());
   ShowInfobarIfPossible();
   // WARNING: |this| may be deleted!
 }
 
 void AlternateNavURLFetcher::StartFetch(NavigationController* controller) {
   controller_ = controller;
-  registrar_.Add(
-      this,
-      content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
-      content::Source<content::WebContents>(controller_->GetWebContents()));
+  content::WebContents* web_contents = controller_->GetWebContents();
+  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
+                 content::Source<content::WebContents>(web_contents));
 
   DCHECK_EQ(NOT_STARTED, state_);
   state_ = IN_PROGRESS;
-  fetcher_.reset(net::URLFetcher::Create(
-      GURL(alternate_nav_url_), net::URLFetcher::HEAD, this));
+  fetcher_.reset(net::URLFetcher::Create(GURL(alternate_nav_url_),
+                                         net::URLFetcher::HEAD, this));
   fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher_->SetRequestContext(
       controller_->GetBrowserContext()->GetRequestContext());
   fetcher_->SetStopOnRedirect(true);
   fetcher_->Start();
 }
 
 void AlternateNavURLFetcher::SetStatusFromURLFetch(
     const GURL& url,
     const net::URLRequestStatus& status,
     int response_code) {
   if (status.is_success()) {
     // HTTP 2xx, 401, and 407 all indicate that the target address exists.
     state_ = (((response_code / 100) == 2) || (response_code == 401) ||
         (response_code == 407)) ? SUCCEEDED : FAILED;
   } else {
     // If we got HTTP 3xx, we'll have auto-canceled; treat this as evidence the
     // target address exists as long as we're not redirected to a common
     // location every time, lest we annoy the user with infobars on everything
     // they type.  See comments on IntranetRedirectDetector.
     state_ = ((status.status() == net::URLRequestStatus::CANCELED) &&
       ((response_code / 100) == 3) &&
       !net::RegistryControlledDomainService::SameDomainOrHost(url,
           IntranetRedirectDetector::RedirectOrigin())) ? SUCCEEDED : FAILED;
   }
 }
 
 void AlternateNavURLFetcher::ShowInfobarIfPossible() {
-  if (!navigated_to_entry_ || state_ != SUCCEEDED) {
-    if (state_ == FAILED)
-      delete this;
+  if (navigated_to_entry_ && (state_ == SUCCEEDED)) {
+    InfoBarTabHelper* infobar_helper =
+        TabContents::FromWebContents(controller_->GetWebContents())->
+            infobar_tab_helper();
+    infobar_helper->AddInfoBar(
+        new AlternateNavInfoBarDelegate(infobar_helper, alternate_nav_url_));
+  } else if (state_ != FAILED) {
     return;
   }
-
-  InfoBarTabHelper* infobar_helper =
-      TabContents::FromWebContents(controller_->GetWebContents())->
-          infobar_tab_helper();
-  infobar_helper->AddInfoBar(
-      new AlternateNavInfoBarDelegate(infobar_helper, alternate_nav_url_));
   delete this;
 }