| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index c958b6428f47e7f70279e51c8306f9ffbef8637d..257a127a40677fb6e9dfc9c65d9fc56bf03ffd57 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -38,13 +38,13 @@ class PrefService;
|
| class PrefRegistrySimple;
|
| class SystemURLRequestContextGetter;
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| namespace chrome {
|
| namespace android {
|
| class ExternalDataUseObserver;
|
| }
|
| }
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
|
|
| namespace base {
|
| class CommandLine;
|
| @@ -138,11 +138,11 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // Global aggregator of data use. It must outlive the
|
| // |system_network_delegate|.
|
| std::unique_ptr<data_usage::DataUseAggregator> data_use_aggregator;
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| // An external observer of data use.
|
| std::unique_ptr<chrome::android::ExternalDataUseObserver>
|
| external_data_use_observer;
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
| // The "system" NetworkDelegate, used for Profile-agnostic network events.
|
| std::unique_ptr<net::NetworkDelegate> system_network_delegate;
|
| std::unique_ptr<net::HostResolver> host_resolver;
|
|
|