Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / website_settings / mock_permission_bubble_request.cc

diff --git a/src/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc b/src/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
index ae38582..300a697 100644 (file)
--- a/src/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
+++ b/src/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "grit/theme_resources.h"
 
 MockPermissionBubbleRequest::MockPermissionBubbleRequest()
     : granted_(false), cancelled_(false), finished_(false) {
@@ -34,7 +35,8 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
 MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {}
 
 int MockPermissionBubbleRequest::GetIconID() const {
-  return 0;
+  // Use a valid icon ID to support UI tests.
+  return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
 }
 
 base::string16 MockPermissionBubbleRequest::GetMessageText() const {