Refactor safe-browsing build-config definitions.

chrome/browser/ui/location_bar/origin_chip_info.cc

 // Copyright 2014 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/ui/location_bar/origin_chip_info.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 149 matching lines @@
 
 // static
 bool OriginChip::IsMalware(const GURL& url, const content::WebContents* tab) {
   DCHECK(tab);
 
   if (tab->GetURL() != url)
     return false;
 
   const safe_browsing::SafeBrowsingTabObserver* sb_observer =
       safe_browsing::SafeBrowsingTabObserver::FromWebContents(tab);
-  return sb_observer && sb_observer->detection_host() &&
-      sb_observer->detection_host()->DidPageReceiveSafeBrowsingMatch();
+  return sb_observer && sb_observer->DidPageReceiveSafeBrowsingMatch();
 }
 
 // static
 base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
                                                   Profile* profile) {
   // First, strip view-source: if it appears.  Note that GetContent removes
   // "view-source:" but leaves the original scheme (http, https, ftp, etc).
   GURL url(provided_url);
   if (url.SchemeIs(content::kViewSourceScheme))
     url = GURL(url.GetContent());
@@ skipping 70 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (url.SchemeIs(chrome::kCrosScheme) ||
       url.SchemeIs(chrome::kDriveScheme))
     return base::UTF8ToUTF16(url.spec());
 #endif
 
   // If all else fails, return the hostname.
   return base::UTF8ToUTF16(url.host());
 }