test: add new sync error test case

Author: dsanders11

lm-tests/fixtures/sync-errors.json

@@ -12,5 +12,12 @@
     "diff": "diff --cc components/webrtc/media_stream_devices_controller.cc\nindex 0f720a2d79f49,bcf00895b6eb7..0000000000000\n--- a/components/webrtc/media_stream_devices_controller.cc\n+++ b/components/webrtc/media_stream_devices_controller.cc\n@@@ -91,8 -91,8 +92,13 @@@ void MediaStreamDevicesController::Requ\n        new MediaStreamDevicesController(web_contents, enumerator, request,\n                                         std::move(callback)));\n  \n++<<<<<<< HEAD\n +  std::vector<blink::mojom::PermissionDescriptorPtr> permission_types;\n +\n++=======\n+   std::vector<blink::PermissionType> permission_types;\n+ #if 0\n++>>>>>>> short-circuit permissions checks in MediaStreamDevicesController\n    content::PermissionController* permission_controller =\n        web_contents->GetBrowserContext()->GetPermissionController();\n",
     "error": "Applying: short-circuit permissions checks in MediaStreamDevicesController\nUsing index info to reconstruct a base tree...\nM components/webrtc/media_stream_devices_controller.cc\nFalling back to patching base and 3-way merge...\nAuto-merging components/webrtc/media_stream_devices_controller.cc\nCONFLICT (content): Merge conflict in components/webrtc/media_stream_devices_controller.cc\nerror: Failed to merge in the changes.\nPatch failed at 0084 short-circuit permissions checks in MediaStreamDevicesController\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nhint: When you have resolved this problem, run \"git am --continue\".\nhint: If you prefer to skip this patch, run \"git am --skip\" instead.\nhint: To restore the original branch and stop patching, run \"git am --abort\".\nhint: Disable this message with \"git config advice.mergeConflict false\"\n",
     "cl": "https://chromium-review.googlesource.com/c/chromium/src/+/6387077"
+  },
+  {
+    "previousVersion": "137.0.7114.0",
+    "newVersion": "137.0.7118.0",
+    "diff": "diff --cc chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\nindex 33f5c6052d25b,fb77589b7ba2e..0000000000000\n--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\n+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\n@@@ -258,114 -257,17 +257,128 @@@ bool MaybeIsLocalUNCPath(const base::Fi\n  }\n  #endif\n  \n++<<<<<<< HEAD\n +// Sentinel used to indicate that no PathService key is specified for a path in\n +// the struct below.\n +constexpr const int kNoBasePathKey = -1;\n +\n +using BlockType = ChromeFileSystemAccessPermissionContext::BlockType;\n +\n +std::vector<ChromeFileSystemAccessPermissionContext::BlockedPath>\n +GenerateBlockedPath() {\n +  return {\n +      // Don't allow users to share their entire home directory, entire desktop\n +      // or entire documents folder, but do allow sharing anything inside those\n +      // directories not otherwise blocked.\n +      {base::DIR_HOME, nullptr, BlockType::kDontBlockChildren},\n +      {base::DIR_USER_DESKTOP, nullptr, BlockType::kDontBlockChildren},\n +      {chrome::DIR_USER_DOCUMENTS, nullptr, BlockType::kDontBlockChildren},\n +      // Similar restrictions for the downloads directory.\n +      {chrome::DIR_DEFAULT_DOWNLOADS, nullptr, BlockType::kDontBlockChildren},\n +      {chrome::DIR_DEFAULT_DOWNLOADS_SAFE, nullptr,\n +       BlockType::kDontBlockChildren},\n +      // The Chrome installation itself should not be modified by the web.\n +      {base::DIR_EXE, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_MODULE, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_ASSETS, nullptr, BlockType::kBlockAllChildren},\n +      // And neither should the configuration of at least the currently running\n +      // Chrome instance (note that this does not take --user-data-dir command\n +      // line overrides into account).\n +      {chrome::DIR_USER_DATA, nullptr, BlockType::kBlockAllChildren},\n +      // ~/.ssh is pretty sensitive on all platforms, so block access to that.\n +      {base::DIR_HOME, FILE_PATH_LITERAL(\".ssh\"), BlockType::kBlockAllChildren},\n +      // And limit access to ~/.gnupg as well.\n +      {base::DIR_HOME, FILE_PATH_LITERAL(\".gnupg\"),\n +       BlockType::kBlockAllChildren},\n +#if BUILDFLAG(IS_WIN)\n +      // Some Windows specific directories to block, basically all apps, the\n +      // operating system itself, as well as configuration data for apps.\n +      {base::DIR_PROGRAM_FILES, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_PROGRAM_FILESX86, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_PROGRAM_FILES6432, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_WINDOWS, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_ROAMING_APP_DATA, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_LOCAL_APP_DATA, nullptr, BlockType::kBlockAllChildren},\n +      {base::DIR_COMMON_APP_DATA, nullptr, BlockType::kBlockAllChildren},\n +      // Opening a file from an MTP device, such as a smartphone or a camera, is\n +      // implemented by Windows as opening a file in the temporary internet\n +      // files directory. To support that, allow opening files in that\n +      // directory, but not whole directories.\n +      {base::DIR_IE_INTERNET_CACHE, nullptr,\n +       BlockType::kBlockNestedDirectories},\n +#endif\n +#if BUILDFLAG(IS_MAC)\n +      // Similar Mac specific blocks.\n +      {base::DIR_APP_DATA, nullptr, BlockType::kBlockAllChildren},\n +      // Block access to the current bundle directory.\n +      {chrome::DIR_OUTER_BUNDLE, nullptr, BlockType::kBlockAllChildren},\n +      // Block access to the user's Applications directory.\n +      {base::DIR_HOME, FILE_PATH_LITERAL(\"Applications\"),\n +       BlockType::kBlockAllChildren},\n +      // Block access to the root Applications directory.\n +      {kNoBasePathKey, FILE_PATH_LITERAL(\"/Applications\"),\n +       BlockType::kBlockAllChildren},\n",
+    "error": "Applying: refactor: expose file system access blocklist\nUsing index info to reconstruct a base tree...\nM chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\nM chrome/browser/file_system_access/chrome_file_system_access_permission_context.h\nFalling back to patching base and 3-way merge...\nAuto-merging chrome/browser/file_system_access/chrome_file_system_access_permission_context.h\nAuto-merging chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\nCONFLICT (content): Merge conflict in chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc\nerror: Failed to merge in the changes.\nPatch failed at 0122 refactor: expose file system access blocklist\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nhint: When you have resolved this problem, run \"git am --continue\".\nhint: If you prefer to skip this patch, run \"git am --skip\" instead.\nhint: To restore the original branch and stop patching, run \"git am --abort\".\nhint: Disable this message with \"git config advice.mergeConflict false\"\n",
+    "cl": "https://chromium-review.googlesource.com/c/chromium/src/+/6429230"
   }
 ]