c/browser, c/common, components S-W: Change ScopedTempDir::path() to GetPath()

chrome/browser/shell_integration_linux_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration_linux.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cstdlib>
@@ skipping 195 matching lines @@
     EXPECT_EQ(web_app::APP_MENU_LOCATION_NONE,
               result.applications_menu_location);
 
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 
   // Shortcut on desktop.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-    base::FilePath desktop_path = temp_dir.path();
+    base::FilePath desktop_path = temp_dir.GetPath();
 
     MockEnvironment env;
     ASSERT_TRUE(base::CreateDirectory(desktop_path));
     ASSERT_TRUE(WriteEmptyFile(desktop_path.Append(kTemplateFilename)));
     web_app::ShortcutLocations result = GetExistingShortcutLocations(
         &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
     EXPECT_EQ(web_app::APP_MENU_LOCATION_NONE,
               result.applications_menu_location);
 
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 
   // Shortcut in applications directory.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-    base::FilePath apps_path = temp_dir.path().Append("applications");
+    base::FilePath apps_path = temp_dir.GetPath().Append("applications");
 
     MockEnvironment env;
-    env.Set("XDG_DATA_HOME", temp_dir.path().value());
+    env.Set("XDG_DATA_HOME", temp_dir.GetPath().value());
     ASSERT_TRUE(base::CreateDirectory(apps_path));
     ASSERT_TRUE(WriteEmptyFile(apps_path.Append(kTemplateFilename)));
     web_app::ShortcutLocations result =
         GetExistingShortcutLocations(&env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
     EXPECT_EQ(web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
               result.applications_menu_location);
 
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 
   // Shortcut in applications directory with NoDisplay=true.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-    base::FilePath apps_path = temp_dir.path().Append("applications");
+    base::FilePath apps_path = temp_dir.GetPath().Append("applications");
 
     MockEnvironment env;
-    env.Set("XDG_DATA_HOME", temp_dir.path().value());
+    env.Set("XDG_DATA_HOME", temp_dir.GetPath().value());
     ASSERT_TRUE(base::CreateDirectory(apps_path));
     ASSERT_TRUE(WriteString(apps_path.Append(kTemplateFilename),
                             kNoDisplayDesktopFile));
     web_app::ShortcutLocations result =
         GetExistingShortcutLocations(&env, kProfilePath, kExtensionId);
     // Doesn't count as being in applications menu.
     EXPECT_FALSE(result.on_desktop);
     EXPECT_EQ(web_app::APP_MENU_LOCATION_HIDDEN,
               result.applications_menu_location);
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 
   // Shortcut on desktop and in applications directory.
   {
     base::ScopedTempDir temp_dir1;
     ASSERT_TRUE(temp_dir1.CreateUniqueTempDir());
-    base::FilePath desktop_path = temp_dir1.path();
+    base::FilePath desktop_path = temp_dir1.GetPath();
 
     base::ScopedTempDir temp_dir2;
     ASSERT_TRUE(temp_dir2.CreateUniqueTempDir());
-    base::FilePath apps_path = temp_dir2.path().Append("applications");
+    base::FilePath apps_path = temp_dir2.GetPath().Append("applications");
 
     MockEnvironment env;
     ASSERT_TRUE(base::CreateDirectory(desktop_path));
     ASSERT_TRUE(WriteEmptyFile(desktop_path.Append(kTemplateFilename)));
-    env.Set("XDG_DATA_HOME", temp_dir2.path().value());
+    env.Set("XDG_DATA_HOME", temp_dir2.GetPath().value());
     ASSERT_TRUE(base::CreateDirectory(apps_path));
     ASSERT_TRUE(WriteEmptyFile(apps_path.Append(kTemplateFilename)));
     web_app::ShortcutLocations result = GetExistingShortcutLocations(
         &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
     EXPECT_EQ(web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS,
               result.applications_menu_location);
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 }
 
 TEST(ShellIntegrationTest, GetExistingShortcutContents) {
   const char kTemplateFilename[] = "shortcut-test.desktop";
   base::FilePath kTemplateFilepath(kTemplateFilename);
   const char kTestData1[] = "a magical testing string";
   const char kTestData2[] = "a different testing string";
 
   base::MessageLoop message_loop;
   content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
 
   // Test that it searches $XDG_DATA_HOME/applications.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     MockEnvironment env;
-    env.Set("XDG_DATA_HOME", temp_dir.path().value());
+    env.Set("XDG_DATA_HOME", temp_dir.GetPath().value());
     // Create a file in a non-applications directory. This should be ignored.
-    ASSERT_TRUE(WriteString(temp_dir.path().Append(kTemplateFilename),
-                            kTestData2));
-    ASSERT_TRUE(base::CreateDirectory(
-        temp_dir.path().Append("applications")));
+    ASSERT_TRUE(
+        WriteString(temp_dir.GetPath().Append(kTemplateFilename), kTestData2));
+    ASSERT_TRUE(
+        base::CreateDirectory(temp_dir.GetPath().Append("applications")));
     ASSERT_TRUE(WriteString(
-        temp_dir.path().Append("applications").Append(kTemplateFilename),
+        temp_dir.GetPath().Append("applications").Append(kTemplateFilename),
         kTestData1));
     std::string contents;
     ASSERT_TRUE(
         GetExistingShortcutContents(&env, kTemplateFilepath, &contents));
     EXPECT_EQ(kTestData1, contents);
   }
 
   // Test that it falls back to $HOME/.local/share/applications.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     MockEnvironment env;
-    base::ScopedPathOverride home_override(base::DIR_HOME,
-                                           temp_dir.path(),
+    base::ScopedPathOverride home_override(base::DIR_HOME, temp_dir.GetPath(),
                                            true /* absolute? */,
                                            false /* create? */);
     ASSERT_TRUE(base::CreateDirectory(
-        temp_dir.path().Append(".local/share/applications")));
-    ASSERT_TRUE(WriteString(
-        temp_dir.path().Append(".local/share/applications")
-            .Append(kTemplateFilename),
-        kTestData1));
+        temp_dir.GetPath().Append(".local/share/applications")));
+    ASSERT_TRUE(WriteString(temp_dir.GetPath()
+                                .Append(".local/share/applications")
+                                .Append(kTemplateFilename),
+                            kTestData1));
     std::string contents;
     ASSERT_TRUE(
         GetExistingShortcutContents(&env, kTemplateFilepath, &contents));
     EXPECT_EQ(kTestData1, contents);
   }
 
   // Test that it searches $XDG_DATA_DIRS/applications.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     MockEnvironment env;
-    env.Set("XDG_DATA_DIRS", temp_dir.path().value());
-    ASSERT_TRUE(base::CreateDirectory(
-        temp_dir.path().Append("applications")));
+    env.Set("XDG_DATA_DIRS", temp_dir.GetPath().value());
+    ASSERT_TRUE(
+        base::CreateDirectory(temp_dir.GetPath().Append("applications")));
     ASSERT_TRUE(WriteString(
-        temp_dir.path().Append("applications").Append(kTemplateFilename),
+        temp_dir.GetPath().Append("applications").Append(kTemplateFilename),
         kTestData2));
     std::string contents;
     ASSERT_TRUE(
         GetExistingShortcutContents(&env, kTemplateFilepath, &contents));
     EXPECT_EQ(kTestData2, contents);
   }
 
   // Test that it searches $X/applications for each X in $XDG_DATA_DIRS.
   {
     base::ScopedTempDir temp_dir1;
     ASSERT_TRUE(temp_dir1.CreateUniqueTempDir());
     base::ScopedTempDir temp_dir2;
     ASSERT_TRUE(temp_dir2.CreateUniqueTempDir());
 
     MockEnvironment env;
-    env.Set("XDG_DATA_DIRS", temp_dir1.path().value() + ":" +
-                             temp_dir2.path().value());
+    env.Set("XDG_DATA_DIRS",
+            temp_dir1.GetPath().value() + ":" + temp_dir2.GetPath().value());
     // Create a file in a non-applications directory. This should be ignored.
-    ASSERT_TRUE(WriteString(temp_dir1.path().Append(kTemplateFilename),
-                            kTestData1));
+    ASSERT_TRUE(
+        WriteString(temp_dir1.GetPath().Append(kTemplateFilename), kTestData1));
     // Only create a findable desktop file in the second path.
-    ASSERT_TRUE(base::CreateDirectory(
-        temp_dir2.path().Append("applications")));
+    ASSERT_TRUE(
+        base::CreateDirectory(temp_dir2.GetPath().Append("applications")));
     ASSERT_TRUE(WriteString(
-        temp_dir2.path().Append("applications").Append(kTemplateFilename),
+        temp_dir2.GetPath().Append("applications").Append(kTemplateFilename),
         kTestData2));
     std::string contents;
     ASSERT_TRUE(
         GetExistingShortcutContents(&env, kTemplateFilepath, &contents));
     EXPECT_EQ(kTestData2, contents);
   }
 }
 
 TEST(ShellIntegrationTest, GetExtensionShortcutFilename) {
   base::FilePath kProfilePath("a/b/c/Profile Name?");
   const char kExtensionId[] = "extensionid";
   EXPECT_EQ(base::FilePath("chrome-extensionid-Profile_Name_.desktop"),
             GetExtensionShortcutFilename(kProfilePath, kExtensionId));
 }
 
 TEST(ShellIntegrationTest, GetExistingProfileShortcutFilenames) {
   base::FilePath kProfilePath("a/b/c/Profile Name?");
   const char kApp1Filename[] = "chrome-extension1-Profile_Name_.desktop";
   const char kApp2Filename[] = "chrome-extension2-Profile_Name_.desktop";
   const char kUnrelatedAppFilename[] = "chrome-extension-Other_Profile.desktop";
 
   base::MessageLoop message_loop;
   content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  ASSERT_TRUE(WriteEmptyFile(temp_dir.path().Append(kApp1Filename)));
-  ASSERT_TRUE(WriteEmptyFile(temp_dir.path().Append(kApp2Filename)));
+  ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kApp1Filename)));
+  ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kApp2Filename)));
   // This file should not be returned in the results.
-  ASSERT_TRUE(WriteEmptyFile(temp_dir.path().Append(kUnrelatedAppFilename)));
+  ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kUnrelatedAppFilename)));
   std::vector<base::FilePath> paths =
-      GetExistingProfileShortcutFilenames(kProfilePath, temp_dir.path());
+      GetExistingProfileShortcutFilenames(kProfilePath, temp_dir.GetPath());
   // Path order is arbitrary. Sort the output for consistency.
   std::sort(paths.begin(), paths.end());
   EXPECT_THAT(paths,
               ElementsAre(base::FilePath(kApp1Filename),
                           base::FilePath(kApp2Filename)));
 }
 
 TEST(ShellIntegrationTest, GetWebShortcutFilename) {
   const struct {
     const char* const path;
@@ skipping 240 matching lines @@
   EXPECT_EQ("baR", internal::GetProgramClassClass(command_line, "foo.desktop"));
 
   command_line = base::CommandLine(base::FilePath());
   command_line.AppendSwitchASCII("user-data-dir", "/tmp/baz");
   EXPECT_EQ("foo (/tmp/baz)",
             internal::GetProgramClassName(command_line, "foo.desktop"));
   EXPECT_EQ("Foo", internal::GetProgramClassClass(command_line, "foo.desktop"));
 }
 
 }  // namespace shell_integration_linux