| Index: chrome/browser/history/chrome_history_backend_client.cc
|
| diff --git a/chrome/browser/history/chrome_history_backend_client.cc b/chrome/browser/history/chrome_history_backend_client.cc
|
| index d41df80e2d93ddc268f060985666afa9ced0c856..5630de205453dc9877773b359b44536cb7249940 100644
|
| --- a/chrome/browser/history/chrome_history_backend_client.cc
|
| +++ b/chrome/browser/history/chrome_history_backend_client.cc
|
| @@ -6,20 +6,19 @@
|
|
|
| #include "build/build_config.h"
|
| #include "chrome/common/channel_info.h"
|
| -#include "chrome/common/features.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| #include "components/version_info/version_info.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| #include "url/gurl.h"
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| #include "chrome/browser/history/android/android_provider_backend.h"
|
| #include "components/history/core/browser/history_backend.h"
|
| #endif
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| namespace {
|
| const base::FilePath::CharType kAndroidCacheFilename[] =
|
| FILE_PATH_LITERAL("AndroidCache");
|
| @@ -78,7 +77,7 @@ bool ChromeHistoryBackendClient::IsWebSafe(const GURL& url) {
|
| url.scheme());
|
| }
|
|
|
| -#if BUILDFLAG(ANDROID_JAVA_UI)
|
| +#if defined(OS_ANDROID)
|
| void ChromeHistoryBackendClient::OnHistoryBackendInitialized(
|
| history::HistoryBackend* history_backend,
|
| history::HistoryDatabase* history_database,
|
| @@ -99,4 +98,4 @@ void ChromeHistoryBackendClient::OnHistoryBackendDestroyed(
|
| const base::FilePath& history_dir) {
|
| sql::Connection::Delete(history_dir.Append(kAndroidCacheFilename));
|
| }
|
| -#endif // BUILDFLAG(ANDROID_JAVA_UI)
|
| +#endif // defined(OS_ANDROID)
|
|
|