Fix Google Drive display paths shown in settings page

Currently paths are shown as:
 Google Drive > ...
 Team Drives > ...
 Computers > ...

This change sets all Google Drives paths to prefix with 'Google Drive'
and adds 'My Drive' for paths in /root.  'Google Drive' is not
localized.  The 'My Drive', 'Team Drives' and 'Computers' labels are.

 Google Drive > My Drive > ...
 Google Drive > Team Drives > ...
 Google Drive > Computers > ...

Bug: 879425
Change-Id: I502dbae82af575a91744abad4a7e98ba15ad8a69
Reviewed-on: https://chromium-review.googlesource.com/c/1304275
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603436}

chrome/browser/chromeos/file_manager/path_util.cc

@@ -418,21 +418,28 @@ std::string GetPathDisplayTextForSettings(Profile* profile,
                            drive_integration_service->GetMountPointPath()
                                .Append(kRootRelativeToDriveMount)
                                .value(),
-                           kGoogleDriveDisplayName)) {
+                           base::FilePath(kGoogleDriveDisplayName)
+                               .Append(l10n_util::GetStringUTF8(
+                                   IDS_FILE_BROWSER_DRIVE_MY_DRIVE_LABEL))
+                               .value())) {
   } else if (drive_integration_service &&
              ReplacePrefix(&result,
                            drive_integration_service->GetMountPointPath()
                                .Append(kTeamDrivesRelativeToDriveMount)
                                .value(),
-                           l10n_util::GetStringUTF8(
-                               IDS_FILE_BROWSER_DRIVE_TEAM_DRIVES_LABEL))) {
+                           base::FilePath(kGoogleDriveDisplayName)
+                               .Append(l10n_util::GetStringUTF8(
+                                   IDS_FILE_BROWSER_DRIVE_TEAM_DRIVES_LABEL))
+                               .value())) {
   } else if (drive_integration_service &&
              ReplacePrefix(&result,
                            drive_integration_service->GetMountPointPath()
                                .Append(kComputersRelativeToDriveMount)
                                .value(),
-                           l10n_util::GetStringUTF8(
-                               IDS_FILE_BROWSER_DRIVE_COMPUTERS_LABEL))) {
+                           base::FilePath(kGoogleDriveDisplayName)
+                               .Append(l10n_util::GetStringUTF8(
+                                   IDS_FILE_BROWSER_DRIVE_COMPUTERS_LABEL))
+                               .value())) {
   } else if (ReplacePrefix(&result, kAndroidFilesPath,
                            l10n_util::GetStringUTF8(
                                IDS_FILE_BROWSER_ANDROID_FILES_ROOT_LABEL))) {

chrome/browser/chromeos/file_manager/path_util_unittest.cc

@@ -138,17 +138,17 @@ TEST(FileManagerPathUtilTest, GetPathDisplayTextForSettings) {
     base::test::ScopedFeatureList features;
     features.InitAndDisableFeature(chromeos::features::kDriveFs);
     drive::DriveIntegrationServiceFactory::GetForProfile(&profile);
-    EXPECT_EQ("Google Drive \u203a foo",
+    EXPECT_EQ("Google Drive \u203a My Drive \u203a foo",
               GetPathDisplayTextForSettings(
                   &profile, "/special/drive-0123456789abcdef/root/foo"));
     EXPECT_EQ(
-        "Team Drives \u203a A Team Drive \u203a foo",
+        "Google Drive \u203a Team Drives \u203a A Team Drive \u203a foo",
         GetPathDisplayTextForSettings(
             &profile,
             "/special/drive-0123456789abcdef/team_drives/A Team Drive/foo"));
 
     EXPECT_EQ(
-        "Computers \u203a My Other Computer \u203a bar",
+        "Google Drive \u203a Computers \u203a My Other Computer \u203a bar",
         GetPathDisplayTextForSettings(
             &profile,
             "/special/drive-0123456789abcdef/Computers/My Other Computer/bar"));
@@ -167,16 +167,17 @@ TEST(FileManagerPathUtilTest, GetPathDisplayTextForSettings) {
 
     drive::DriveIntegrationServiceFactory::GetForProfile(&profile2);
     EXPECT_EQ(
-        "Google Drive \u203a foo",
+        "Google Drive \u203a My Drive \u203a foo",
         GetPathDisplayTextForSettings(
             &profile2,
             "/media/fuse/drivefs-84675c855b63e12f384d45f033826980/root/foo"));
-    EXPECT_EQ("Team Drives \u203a A Team Drive \u203a foo",
+    EXPECT_EQ("Google Drive \u203a Team Drives \u203a A Team Drive \u203a foo",
               GetPathDisplayTextForSettings(
                   &profile2,
                   "/media/fuse/drivefs-84675c855b63e12f384d45f033826980/"
                   "team_drives/A Team Drive/foo"));
-    EXPECT_EQ("Computers \u203a My Other Computer \u203a bar",
+    EXPECT_EQ(
+        "Google Drive \u203a Computers \u203a My Other Computer \u203a bar",
         GetPathDisplayTextForSettings(
             &profile2,
             "/media/fuse/drivefs-84675c855b63e12f384d45f033826980/"