Roll src/third_party/cros_system_api/ d5ad6a50d..5df72efed (1 commit)

https://chromium.googlesource.com/chromiumos/platform2/system_api.git/+log/d5ad6a50d168..5df72efed1de

$ git log d5ad6a50d..5df72efed --date=short --no-merges --format='%ad %ae %s'
2020-09-15 fletcherw system_api: add scan dimensions to lorgnette API

Created with:
  roll-dep src/third_party/cros_system_api

Also, update the scanning mojom file and type converters to handle the
new enum value in lorgnette_service.proto.

Bug: None
Change-Id: Ib425f99fdacaa85cd9559b567a2d5b15e61d02e3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443271
Auto-Submit: Jesse Schettler <jschettler@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813050}

DEPS

@@ -896,7 +896,7 @@ deps = {
 
   # For Linux and Chromium OS.
   'src/third_party/cros_system_api': {
-      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + 'd5ad6a50d168252d431f99cd227e327a86c567ff',
+      'url': Var('chromium_git') + '/chromiumos/platform2/system_api.git' + '@' + '5df72efed1de3c81f7590dbc09b240cb6edc4cd6',
       'condition': 'checkout_linux',
   },
 

chrome/browser/chromeos/scanning/scanning_type_converters.cc

@@ -44,11 +44,13 @@ struct TypeConverter<mojo_ipc::SourceType, lorgnette::SourceType> {
         return mojo_ipc::SourceType::kAdfSimplex;
       case lorgnette::SOURCE_ADF_DUPLEX:
         return mojo_ipc::SourceType::kAdfDuplex;
+      case lorgnette::SOURCE_DEFAULT:
+        return mojo_ipc::SourceType::kDefault;
       case lorgnette::SOURCE_UNSPECIFIED:
       case lorgnette::SourceType_INT_MIN_SENTINEL_DO_NOT_USE_:
       case lorgnette::SourceType_INT_MAX_SENTINEL_DO_NOT_USE_:
         NOTREACHED();
-        return mojo_ipc::SourceType::kFlatbed;
+        return mojo_ipc::SourceType::kUnknown;
     }
   }
 };

chrome/browser/chromeos/scanning/scanning_type_converters_unittest.cc

@@ -100,6 +100,9 @@ INSTANTIATE_TEST_SUITE_P(
             mojo_ipc::SourceType::kAdfSimplex, mojo_ipc::ColorMode::kGrayscale},
         ScanningTypeConvertersTestParams{
             lorgnette::SOURCE_ADF_DUPLEX, lorgnette::MODE_COLOR,
-            mojo_ipc::SourceType::kAdfDuplex, mojo_ipc::ColorMode::kColor}));
+            mojo_ipc::SourceType::kAdfDuplex, mojo_ipc::ColorMode::kColor},
+        ScanningTypeConvertersTestParams{
+            lorgnette::SOURCE_DEFAULT, lorgnette::MODE_COLOR,
+            mojo_ipc::SourceType::kDefault, mojo_ipc::ColorMode::kColor}));
 
 }  // namespace chromeos

chromeos/components/scanning/mojom/scanning.mojom

@@ -16,12 +16,17 @@ enum ColorMode {
 
 // The source types from which a scan can be obtained.
 enum SourceType {
+  // An unknown source type.
+  kUnknown,
   // A flatbed that scans a single page.
   kFlatbed,
   // An automatic document feeder that scans a single side of each page.
   kAdfSimplex,
   // An automatic document feeder that scans both sides of each page.
   kAdfDuplex,
+  // The implicit source type used for scanners that do not report any source
+  // options.
+  kDefault,
 };
 
 // The source from which a scan can be obtained.