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

Unified Diff: content/browser/shapedetection/shapedetection_browsertest.cc

Issue 2655303005: Shape detection service: Add QR detection in Mac (Closed)
Patch Set: Don't init explicitly a vector of vectors 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
Index: content/browser/shapedetection/shapedetection_browsertest.cc
diff --git a/content/browser/shapedetection/shapedetection_browsertest.cc b/content/browser/shapedetection/shapedetection_browsertest.cc
index 9d9c1e2a004ac42c9e147839c212451441ee0f5d..dd9f4ef546eaf7e366d6b85f19896a32335c11c7 100644
--- a/content/browser/shapedetection/shapedetection_browsertest.cc
+++ b/content/browser/shapedetection/shapedetection_browsertest.cc
@@ -12,7 +12,7 @@
namespace content {
// TODO(xianglu): Enable other platforms support. https://crbug.com/646083
-#if defined(OS_ANDROID) || defined(OS_MACOSX)
+#if defined(OS_ANDROID)
#define MAYBE_ShapeDetectionBrowserTest ShapeDetectionBrowserTest
#else
#define MAYBE_ShapeDetectionBrowserTest DISABLED_ShapeDetectionBrowserTest
@@ -80,14 +80,11 @@ IN_PROC_BROWSER_TEST_F(MAYBE_ShapeDetectionBrowserTest,
IN_PROC_BROWSER_TEST_F(MAYBE_ShapeDetectionBrowserTest,
DetectFacesOnImageWithOneFace) {
const std::string image_path = "/single_face.jpg";
- std::vector<std::vector<float>> expected_results;
#if defined(OS_ANDROID)
- const std::vector<float> expected_result = {68.640625, 102.96875, 171.5625,
- 171.5625};
- expected_results.push_back(expected_result);
-#elif defined(OS_MACOSX)
- const std::vector<float> expected_result = {0, 93, 290, 290};
- expected_results.push_back(expected_result);
+ const std::vector<std::vector<float>> expected_results{
+ {68.640625, 102.96875, 171.5625, 171.5625}};
+#else
+ const std::vector<std::vector<float>> expected_results;
#endif
RunDetectFacesOnImageUrl(image_path, expected_results);
« no previous file with comments | « content/browser/shapedetection/face_detection_service_dispatcher.h ('k') | content/test/data/media/face_detection_test.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698