diff options
| author | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 02:10:37 +0000 |
|---|---|---|
| committer | mgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 02:10:37 +0000 |
| commit | a7e18f43ed8e1fa0a1b53ed68397a42230557b6a (patch) | |
| tree | 126da61058b3036068ee7e60b341b4f5d0edf73e | |
| parent | a5a5aaf6842fc28cf8fe21d716fcbd2c08779449 (diff) | |
| download | chromium_src-a7e18f43ed8e1fa0a1b53ed68397a42230557b6a.zip chromium_src-a7e18f43ed8e1fa0a1b53ed68397a42230557b6a.tar.gz chromium_src-a7e18f43ed8e1fa0a1b53ed68397a42230557b6a.tar.bz2 | |
Fix ShellIntegrationTest failing on Linux Official Builder.
On GOOGLE_CHROME_BUILD it needs to expect Icon=google-chrome, not
Icon=chromium-browser.
BUG=328822
Review URL: https://codereview.chromium.org/117893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241762 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/shell_integration_linux_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/shell_integration_linux_unittest.cc b/chrome/browser/shell_integration_linux_unittest.cc index 85e3bf7..b595e36 100644 --- a/chrome/browser/shell_integration_linux_unittest.cc +++ b/chrome/browser/shell_integration_linux_unittest.cc @@ -479,7 +479,11 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) { "Type=Application\n" "Name=GMail\n" "Exec=/opt/google/chrome/google-chrome --app=http://gmail.com/\n" +#if defined(GOOGLE_CHROME_BUILD) + "Icon=google-chrome\n" +#else "Icon=chromium-browser\n" +#endif "StartupWMClass=gmail.com\n" }, @@ -601,7 +605,11 @@ TEST(ShellIntegrationTest, GetDirectoryFileContents) { "Version=1.0\n" "Type=Directory\n" "Name=Chrome Apps\n" +#if defined(GOOGLE_CHROME_BUILD) + "Icon=google-chrome\n" +#else "Icon=chromium-browser\n" +#endif }, }; |