GTK: improve app mode .desktop file creation.

1) pass --user-data-dir when appropriate
2) don't overwrite old .desktop files that share the same name.

BUG=23353

Review URL: http://codereview.chromium.org/255016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27700 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 4f8ddef..6352d5a 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -69,7 +69,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
       "Version=1.0\n"
       "Encoding=UTF-8\n"
       "Name=GMail\n"
-      "Exec=/opt/google/chrome/google-chrome \"--app=http://gmail.com/\"\n"
+      "Exec=/opt/google/chrome/google-chrome --app=\"http://gmail.com/\"\n"
       "Terminal=false\n"
       "Icon=chrome-http__gmail.com\n"
       "Type=Application\n"
@@ -88,7 +88,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
-      "Exec=/opt/google/chrome/google-chrome \"--app=http://gmail.com/\"\n"
+      "Exec=/opt/google/chrome/google-chrome --app=\"http://gmail.com/\"\n"
     },
 
     // Make sure i18n-ed comments are removed.
@@ -102,7 +102,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
-      "Exec=/opt/google/chrome/google-chrome \"--app=http://gmail.com/\"\n"
+      "Exec=/opt/google/chrome/google-chrome --app=\"http://gmail.com/\"\n"
     },
 
     // Make sure that empty icons are replaced by the chrome icon.
@@ -117,7 +117,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
 
       "#!/usr/bin/env xdg-open\n"
       "Name=GMail\n"
-      "Exec=/opt/google/chrome/google-chrome \"--app=http://gmail.com/\"\n"
+      "Exec=/opt/google/chrome/google-chrome --app=\"http://gmail.com/\"\n"
       "Icon=/opt/google/chrome/product_logo_48.png\n"
     },
 
@@ -132,7 +132,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
       "#!/usr/bin/env xdg-open\n"
       "Name=http://evil.com/evil%20--join-the-b0tnet\n"
       "Exec=/opt/google/chrome/google-chrome "
-      "\"--app=http://evil.com/evil%%20--join-the-b0tnet\"\n"
+      "--app=\"http://evil.com/evil%%20--join-the-b0tnet\"\n"
     },
     { "http://evil.com/evil; rm -rf /; \"; rm -rf $HOME >ownz0red",
       "Innocent Title",
@@ -144,7 +144,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
       "#!/usr/bin/env xdg-open\n"
       "Name=Innocent Title\n"
       "Exec=/opt/google/chrome/google-chrome "
-      "\"--app=http://evil.com/evil%%20rm%%20-rf%%20/%%20%%22%%20rm%%20"
+      "--app=\"http://evil.com/evil%%20rm%%20-rf%%20/%%20%%22%%20rm%%20"
       "-rf%%20HOME%%20%%3Eownz0red\"\n"
     },
     { "http://evil.com/evil | cat `echo ownz0red` >/dev/null\\",
@@ -157,7 +157,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
       "#!/usr/bin/env xdg-open\n"
       "Name=Innocent Title\n"
       "Exec=/opt/google/chrome/google-chrome "
-      "\"--app=http://evil.com/evil%%20%%7C%%20cat%%20%%60echo%%20ownz0red"
+      "--app=\"http://evil.com/evil%%20%%7C%%20cat%%20%%60echo%%20ownz0red"
       "%%60%%20%%3E/dev/null/\"\n"
     },
   };