| Index: chrome/browser/net/net_error_tab_helper_unittest.cc
|
| diff --git a/chrome/browser/net/net_error_tab_helper_unittest.cc b/chrome/browser/net/net_error_tab_helper_unittest.cc
|
| index daab84b5c63a8e8eb4b26c42b6068db2cff687fb..541ef92af322315286d5be9528985de6dd0a7052 100644
|
| --- a/chrome/browser/net/net_error_tab_helper_unittest.cc
|
| +++ b/chrome/browser/net/net_error_tab_helper_unittest.cc
|
| @@ -27,9 +27,9 @@ class TestNetErrorTabHelper : public NetErrorTabHelper {
|
| mock_probe_running_(false),
|
| last_status_sent_(error_page::DNS_PROBE_MAX),
|
| mock_sent_count_(0),
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| times_download_page_later_invoked_(0),
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
| times_diagnostics_dialog_invoked_(0) {}
|
|
|
| void FinishProbe(DnsProbeStatus status) {
|
| @@ -42,7 +42,7 @@ class TestNetErrorTabHelper : public NetErrorTabHelper {
|
| DnsProbeStatus last_status_sent() const { return last_status_sent_; }
|
| int mock_sent_count() const { return mock_sent_count_; }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| using NetErrorTabHelper::DownloadPageLater;
|
|
|
| const GURL& download_page_later_url() const {
|
| @@ -52,7 +52,7 @@ class TestNetErrorTabHelper : public NetErrorTabHelper {
|
| int times_download_page_later_invoked() const {
|
| return times_download_page_later_invoked_;
|
| }
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
|
|
| const std::string& network_diagnostics_url() const {
|
| return network_diagnostics_url_;
|
| @@ -89,20 +89,20 @@ class TestNetErrorTabHelper : public NetErrorTabHelper {
|
| times_diagnostics_dialog_invoked_++;
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| void DownloadPageLaterHelper(const GURL& url) override {
|
| download_page_later_url_ = url;
|
| times_download_page_later_invoked_++;
|
| }
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
|
|
| bool mock_probe_running_;
|
| DnsProbeStatus last_status_sent_;
|
| int mock_sent_count_;
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| GURL download_page_later_url_;
|
| int times_download_page_later_invoked_;
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
| std::string network_diagnostics_url_;
|
| int times_diagnostics_dialog_invoked_;
|
| };
|
| @@ -169,7 +169,7 @@ class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness {
|
| }
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| void NoDownloadPageLaterForNonHttpSchemes(const char* url_string,
|
| bool succeeded) {
|
| GURL url(url_string);
|
| @@ -371,7 +371,7 @@ TEST_F(NetErrorTabHelperTest, NoDiagnosticsForNonHttpSchemes) {
|
| }
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| TEST_F(NetErrorTabHelperTest, DownloadPageLater) {
|
| GURL url("http://somewhere:123/");
|
| LoadURL(url, false /*succeeded*/);
|
| @@ -406,4 +406,4 @@ TEST_F(NetErrorTabHelperTest, NoDownloadPageLaterForNonHttpSchemes3) {
|
| NoDownloadPageLaterForNonHttpSchemes("about:blank", true);
|
| }
|
|
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
|
|