summaryrefslogtreecommitdiff
path: root/chromium/services/shape_detection
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/services/shape_detection')
-rw-r--r--chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java2
-rw-r--r--chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h1
-rw-r--r--chromium/services/shape_detection/detection_utils_win.cc1
3 files changed, 3 insertions, 1 deletions
diff --git a/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java b/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java
index 19f96b32d2c..e96cb1ffa9e 100644
--- a/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java
+++ b/chromium/services/shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java
@@ -24,7 +24,7 @@ import org.chromium.skia.mojom.ImageInfo;
* Test suite for conversion-to-Frame utils.
*/
@RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@Config(sdk = 21, manifest = Config.NONE)
public class BitmapUtilsTest {
private static final int VALID_WIDTH = 1;
private static final int VALID_HEIGHT = 1;
diff --git a/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h b/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h
index 9438277f6eb..809c4b57521 100644
--- a/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h
+++ b/chromium/services/shape_detection/barcode_detection_impl_mac_vision_api.h
@@ -12,6 +12,7 @@
#import <Foundation/Foundation.h>
#include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
namespace shape_detection {
diff --git a/chromium/services/shape_detection/detection_utils_win.cc b/chromium/services/shape_detection/detection_utils_win.cc
index 2d8c73dc4e6..f865ebb60ca 100644
--- a/chromium/services/shape_detection/detection_utils_win.cc
+++ b/chromium/services/shape_detection/detection_utils_win.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/check_op.h"
#include "base/logging.h"
#include "base/numerics/checked_math.h"
#include "base/win/winrt_storage_util.h"