Merge the intranet redirect blacklist to 249. Contains the following two cha...

chrome/browser/alternate_nav_url_fetcher.cc

 // Copyright (c) 2006-2008 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "net/base/registry_controlled_domain.h"
 
 AlternateNavURLFetcher::AlternateNavURLFetcher(
     const GURL& alternate_nav_url)
     : LinkInfoBarDelegate(NULL),
       alternate_nav_url_(alternate_nav_url),
       controller_(NULL),
       state_(NOT_STARTED),
       navigated_to_entry_(false),
       infobar_contents_(NULL) {
   registrar_.Add(this, NotificationType::NAV_ENTRY_PENDING,
@@ skipping 52 matching lines @@
                                                 const URLRequestStatus& status,
                                                 int response_code,
                                                 const ResponseCookies& cookies,
                                                 const std::string& data) {
   DCHECK(fetcher_.get() == source);
   if (status.is_success() &&
       // HTTP 2xx, 401, and 407 all indicate that the target address exists.
       (((response_code / 100) == 2) ||
        (response_code == 401) || (response_code == 407))) {
     state_ = SUCCEEDED;
+
+    // The following TLD+1s are used as destinations by ISPs/DNS providers/etc.
+    // who return provider-controlled pages to arbitrary user navigation
+    // attempts.  Because this can result in infobars on large fractions of user
+    // searches, we don't show automatic infobars for these.  Note that users
+    // can still choose to explicitly navigate to or search for pages in these
+    // domains, and can still get infobars for cases that wind up on other
+    // domains (e.g. legit intranet sites), we're just trying to avoid
+    // erroneously harassing the user with our own UI prompts.
+    const char* kBlacklistedSites[] = {
+        // NOTE: Use complete URLs, because GURL() doesn't do fixup!
+        "http://comcast.com/",
+        "http://opendns.com/",
+        "http://verizon.net/",
+    };
+    for (size_t i = 0; i < arraysize(kBlacklistedSites); ++i) {
+      if (net::RegistryControlledDomainService::SameDomainOrHost(
+          url, GURL(kBlacklistedSites[i]))) {
+        state_ = FAILED;
+        break;
+      }
+    }
   } else {
     state_ = FAILED;
   }
+
   ShowInfobarIfPossible();
 }
 
 std::wstring AlternateNavURLFetcher::GetMessageTextWithOffset(
     size_t* link_offset) const {
   const std::wstring label = l10n_util::GetStringF(
       IDS_ALTERNATE_NAV_URL_VIEW_LABEL, std::wstring(), link_offset);
   DCHECK(*link_offset != std::wstring::npos);
   return label;
 }
@@ skipping 29 matching lines @@
     if (state_ == FAILED)
       delete this;
     return;
   }
 
   infobar_contents_ = controller_->tab_contents();
   StoreActiveEntryUniqueID(infobar_contents_);
   // We will be deleted when the InfoBar is destroyed. (See InfoBarClosed).
   infobar_contents_->AddInfoBar(this);
 }