Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1936)

Unified Diff: chrome/test/base/testing_profile.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/common/BUILD.gn ('K') | « chrome/test/base/chrome_test_suite.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 1adff17cdaf4dfada47314a6c45c03076940ef2d..a99ccbfca04fdd6296bf001ab86aed16a7a8490a 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -126,7 +126,7 @@
#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
#endif
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
#include "components/offline_pages/core/stub_offline_page_model.h"
#endif
@@ -251,7 +251,7 @@ std::unique_ptr<KeyedService> BuildWebDataService(
&TestProfileErrorCallback);
}
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
std::unique_ptr<KeyedService> BuildOfflinePageModel(
content::BrowserContext* context) {
return base::MakeUnique<offline_pages::StubOfflinePageModel>();
@@ -624,7 +624,7 @@ void TestingProfile::CreateBookmarkModel(bool delete_file) {
base::FilePath path = GetPath().Append(bookmarks::kBookmarksFileName);
base::DeleteFile(path, false);
}
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
offline_pages::OfflinePageModelFactory::GetInstance()->SetTestingFactory(
this, BuildOfflinePageModel);
#endif
« chrome/common/BUILD.gn ('K') | « chrome/test/base/chrome_test_suite.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698