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

Unified Diff: content/browser/download/download_manager_impl_unittest.cc

Issue 2874833002: Don't compile code for desktop zoom or GuestViews on mobile platforms. (Closed)
Patch Set: Rebase. Created 3 years, 7 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
Index: content/browser/download/download_manager_impl_unittest.cc
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 3e606c2abefc923aea505775bbb8d5af31999077..c43e4df952b1e64331fca8fb11bd129c3ce8cfc2 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -38,7 +38,6 @@
#include "content/public/browser/download_interrupt_reasons.h"
#include "content/public/browser/download_item.h"
#include "content/public/browser/download_manager_delegate.h"
-#include "content/public/browser/zoom_level_delegate.h"
#include "content/public/test/mock_download_item.h"
#include "content/public/test/test_browser_context.h"
#include "content/public/test/test_browser_thread.h"
@@ -48,6 +47,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "url/origin.h"
+#if !defined(OS_ANDROID)
+#include "content/public/browser/zoom_level_delegate.h"
+#endif // !defined(OS_ANDROID)
+
using ::testing::AllOf;
using ::testing::DoAll;
using ::testing::Eq;
@@ -304,8 +307,10 @@ class MockBrowserContext : public BrowserContext {
~MockBrowserContext() {}
MOCK_CONST_METHOD0(GetPath, base::FilePath());
+#if !defined(OS_ANDROID)
MOCK_METHOD1(CreateZoomLevelDelegateMock,
ZoomLevelDelegate*(const base::FilePath&));
+#endif // !defined(OS_ANDROID)
MOCK_CONST_METHOD0(IsOffTheRecord, bool());
MOCK_METHOD0(GetResourceContext, ResourceContext*());
MOCK_METHOD0(GetDownloadManagerDelegate, DownloadManagerDelegate*());
@@ -338,12 +343,13 @@ class MockBrowserContext : public BrowserContext {
URLRequestInterceptorScopedVector request_interceptors) override {
return nullptr;
}
-
+#if !defined(OS_ANDROID)
std::unique_ptr<ZoomLevelDelegate> CreateZoomLevelDelegate(
const base::FilePath& path) override {
return std::unique_ptr<ZoomLevelDelegate>(
CreateZoomLevelDelegateMock(path));
}
+#endif // !defined(OS_ANDROID)
};
class MockDownloadManagerObserver : public DownloadManager::Observer {

Powered by Google App Engine
This is Rietveld 408576698