Move some global feature defines to buildflags

chrome/browser/ssl/ssl_error_handler_unittest.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/ssl/ssl_error_handler.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/common_name_mismatch_handler.h"
+#include "chrome/common/features.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/captive_portal/captive_portal_testing_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_info.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_certificate_data.h"
 #include "net/test/test_data_directory.h"
@@ skipping 131 matching lines @@
   }
 
   SSLErrorHandlerForTest* error_handler() { return error_handler_.get(); }
 
  private:
   net::SSLInfo ssl_info_;
   std::unique_ptr<SSLErrorHandlerForTest> error_handler_;
   base::FieldTrialList field_trial_list_;
 };
 
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 
 TEST_F(SSLErrorHandlerTest,
        ShouldShowSSLInterstitialOnTimerExpired) {
   EXPECT_FALSE(error_handler()->IsTimerRunning());
   error_handler()->StartHandlingError();
 
   EXPECT_TRUE(error_handler()->IsTimerRunning());
   EXPECT_TRUE(error_handler()->captive_portal_checked());
   EXPECT_FALSE(error_handler()->ssl_interstitial_shown());
   EXPECT_FALSE(error_handler()->captive_portal_interstitial_shown());
@@ skipping 84 matching lines @@
 
   EXPECT_FALSE(error_handler()->suggested_url_checked());
   EXPECT_TRUE(error_handler()->captive_portal_checked());
   EXPECT_TRUE(error_handler()->IsTimerRunning());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(error_handler()->IsTimerRunning());
   EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
 }
 
-#else  // #if !defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#else  // #if !BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 
 TEST_F(SSLErrorHandlerTest,
        ShouldShowSSLInterstitialOnCaptivePortalDetectionDisabled) {
   EXPECT_FALSE(error_handler()->IsTimerRunning());
   error_handler()->StartHandlingError();
   EXPECT_FALSE(error_handler()->IsTimerRunning());
   EXPECT_FALSE(error_handler()->captive_portal_checked());
   EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
   EXPECT_FALSE(error_handler()->captive_portal_interstitial_shown());
 }
 
-#endif  // defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+#endif  // BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 
 TEST_F(SSLErrorHandlerTest,
        ShouldShowSSLInterstitialOnTimerExpiredWhenSuggestedUrlExists) {
   error_handler()->set_suggested_url_exists();
   error_handler()->StartHandlingError();
 
   EXPECT_TRUE(error_handler()->IsTimerRunning());
   EXPECT_TRUE(error_handler()->suggested_url_checked());
   EXPECT_FALSE(error_handler()->ssl_interstitial_shown());
   EXPECT_FALSE(error_handler()->redirected_to_suggested_url());
@@ skipping 37 matching lines @@
   // Fake an Invalid Suggested URL Check result.
   error_handler()->SendSuggestedUrlCheckResult(
       CommonNameMismatchHandler::SuggestedUrlCheckResult::
           SUGGESTED_URL_NOT_AVAILABLE,
       GURL());
 
   EXPECT_FALSE(error_handler()->IsTimerRunning());
   EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
   EXPECT_FALSE(error_handler()->redirected_to_suggested_url());
 }