Index: chrome/browser/permissions/mock_permission_request.cc |
diff --git a/chrome/browser/permissions/mock_permission_request.cc b/chrome/browser/permissions/mock_permission_request.cc |
index ae217961b86ed5d139127ab0737aa2d2458c702c..c7e04212f02b6792af273c088e9eedb8437a465d 100644 |
--- a/chrome/browser/permissions/mock_permission_request.cc |
+++ b/chrome/browser/permissions/mock_permission_request.cc |
@@ -6,7 +6,12 @@ |
#include "base/strings/string16.h" |
#include "base/strings/utf_string_conversions.h" |
+ |
+#if defined(OS_ANDROID) |
+#include "chrome/browser/android/android_theme_resources.h" |
+#else |
#include "ui/vector_icons/vector_icons.h" |
+#endif |
MockPermissionRequest::MockPermissionRequest() |
: MockPermissionRequest("test", |
@@ -61,8 +66,18 @@ MockPermissionRequest::~MockPermissionRequest() {} |
PermissionRequest::IconId MockPermissionRequest::GetIconId() const { |
// Use a valid icon ID to support UI tests. |
+#if defined(OS_ANDROID) |
+ return IDR_ANDROID_INFOBAR_WARNING; |
+#else |
return ui::kWarningIcon; |
+#endif |
+} |
+ |
+#if defined(OS_ANDROID) |
+base::string16 MockPermissionRequest::GetMessageText() const { |
+ return text_; |
} |
+#endif |
base::string16 MockPermissionRequest::GetMessageTextFragment() const { |
return text_; |