Add parentheses to appease -Wstring-concatenation

Bug: 1114873
Change-Id: Ie29e6422f28d70844351d16ed16237d5e2d6b7a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358032Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
Cr-Commit-Position: refs/heads/master@{#798501}

chrome/browser/download/download_browsertest.cc

@@ -3663,15 +3663,15 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_CrazyFilenames) {
   static constexpr const wchar_t* kCrazyFilenames[] = {
       L"a_file_name.zip",
       L"\u89c6\u9891\u76f4\u64ad\u56fe\u7247.zip",  // chinese chars
-      L"\u0412\u043e "
-      L"\u0424\u043b\u043e\u0440\u0438\u0434\u0435\u043e\u0431\u044a"
-      L"\u044f\u0432\u043b\u0435\u043d\u0440\u0435\u0436\u0438\u043c \u0427"
-      L"\u041f \u0438\u0437-\u0437\u0430 \u0443\u0442\u0435\u0447\u043a\u0438 "
-      L"\u043d\u0435\u0444\u0442\u0438.zip",  // russian
+      (L"\u0412\u043e "
+       L"\u0424\u043b\u043e\u0440\u0438\u0434\u0435\u043e\u0431\u044a"
+       L"\u044f\u0432\u043b\u0435\u043d\u0440\u0435\u0436\u0438\u043c \u0427"
+       L"\u041f \u0438\u0437-\u0437\u0430 \u0443\u0442\u0435\u0447\u043a\u0438 "
+       L"\u043d\u0435\u0444\u0442\u0438.zip"),  // russian
       L"Desocupa\xe7\xe3o est\xe1vel.zip",
       // arabic:
-      L"\u0638\u2026\u0638\u02c6\u0637\xa7\u0638\u201a\u0637\xb9 \u0638\u201e"
-      L"\u0638\u201e\u0637\xb2\u0638\u0679\u0637\xa7\u0637\xb1\u0637\xa9.zip",
+      (L"\u0638\u2026\u0638\u02c6\u0637\xa7\u0638\u201a\u0637\xb9 \u0638\u201e"
+       L"\u0638\u201e\u0637\xb2\u0638\u0679\u0637\xa7\u0637\xb1\u0637\xa9.zip"),
       L"\u05d4\u05e2\u05d3\u05e4\u05d5\u05ea.zip",  // hebrew
       L"\u092d\u093e\u0930\u0924.zip",              // hindi
       L"d\xe9stabilis\xe9.zip",                     // french
@@ -3679,7 +3679,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, MAYBE_DownloadTest_CrazyFilenames) {
       L"\u97d3-\u4e2d \uc815\uc0c1, \ucc9c\uc548\ud568 \uc758\uacac.zip",
       L"jiho....tiho...miho.zip",
       L"jiho!@#$tiho$%^&-()_+=miho copy.zip",  // special chars
-      L"Wohoo-to hoo+I.zip", L"Picture 1.zip",
+      L"Wohoo-to hoo+I.zip",
+      L"Picture 1.zip",
       L"This is a very very long english sentence with spaces and , and +.zip",
   };
 

chrome/browser/plugins/flash_download_interception_unittest.cc

@@ -58,8 +58,8 @@ TEST_F(FlashDownloadInterceptionTest, DownloadUrlVariations) {
       "http://adobe.com/go/CA-H-GET-FLASH",
       "http://adobe.com/go/DE_CH-H-M-A2",
       "http://adobe.com/go/gntray_dl_getflashplayer_jp",
-      "http://www.adobe.com/shockwave/download/download.cgi?"
-      "P1_Prod_Version=ShockwaveFlash",
+      ("http://www.adobe.com/shockwave/download/download.cgi?"
+       "P1_Prod_Version=ShockwaveFlash"),
   };
 
   for (auto* url : flash_intercept_urls) {
@@ -81,8 +81,8 @@ TEST_F(FlashDownloadInterceptionTest, DownloadUrlVariations) {
       // Don't match text within the query or fragment.
       "http://www.adobe.com/go/non-matching?foo=flashplayer",
       "http://www.adobe.com/go/non-matching#!foo=flashplayer",
-      "http://www.adobe.com/shockwave/download/download.cgi?"
-      "P1_Prod_Version=SomethingElse",
+      ("http://www.adobe.com/shockwave/download/download.cgi?"
+       "P1_Prod_Version=SomethingElse"),
   };
 
   for (auto* url : flash_no_intercept_urls) {

chrome/browser/ui/popup_browsertest.cc

@@ -165,8 +165,8 @@ IN_PROC_BROWSER_TEST_P(PopupBrowserTest, MoveClampedToCurrentDisplay) {
       "moveTo(screen.availLeft - 50, screen.availTop);",
       "moveTo(screen.availLeft, screen.availTop + screen.availHeight + 50);",
       "moveTo(screen.availLeft, screen.availTop - 50);",
-      "moveTo(screen.availLeft + screen.availWidth + 50, "
-      "screen.availTop + screen.availHeight + 50);",
+      ("moveTo(screen.availLeft + screen.availWidth + 50, "
+       "screen.availTop + screen.availHeight + 50);"),
       "moveTo(screen.availLeft - 50, screen.availTop - 50);",
   };
   for (auto* const script : kMoveScripts) {