Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/shell_integration_linux.h

Index: chrome/browser/shell_integration_linux.h
diff --git a/chrome/browser/shell_integration_linux.h b/chrome/browser/shell_integration_linux.h
index 44f0b7c413ad9011bad909346d005fea02e55dc2..d7e5c7792ba454d116f460a187595050a6bc895b 100644
--- a/chrome/browser/shell_integration_linux.h
+++ b/chrome/browser/shell_integration_linux.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "chrome/browser/shell_integration.h"
+#include "chrome/browser/web_applications/web_app.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -48,7 +48,7 @@ std::string GetIconName();
 // This searches the file system for .desktop files in appropriate locations. A
 // shortcut with NoDisplay=true causes hidden to become true, instead of
 // creating at APP_MENU_LOCATIONS_SUBDIR_CHROMEAPPS.
-ShellIntegration::ShortcutLocations GetExistingShortcutLocations(
+web_app::ShortcutLocations GetExistingShortcutLocations(
     base::Environment* env,
     const base::FilePath& profile_path,
     const std::string& extension_id);
@@ -56,7 +56,7 @@ ShellIntegration::ShortcutLocations GetExistingShortcutLocations(
 // Version of GetExistingShortcutLocations which takes an explicit path
 // to the user's desktop directory. Useful for testing.
 // If |desktop_path| is empty, the desktop is not searched.
-ShellIntegration::ShortcutLocations GetExistingShortcutLocations(
+web_app::ShortcutLocations GetExistingShortcutLocations(
     base::Environment* env,
     const base::FilePath& profile_path,
     const std::string& extension_id,
@@ -116,8 +116,8 @@ std::string GetDirectoryFileContents(const base::string16& title,
 // For extensions, duplicate shortcuts are avoided, so if a requested shortcut
 // already exists it is deleted first.
 bool CreateDesktopShortcut(
-    const ShellIntegration::ShortcutInfo& shortcut_info,
-    const ShellIntegration::ShortcutLocations& creation_locations);
+    const web_app::ShortcutInfo& shortcut_info,
+    const web_app::ShortcutLocations& creation_locations);
 
 // Create shortcuts in the application menu for the app launcher. Duplicate
 // shortcuts are avoided, so if a requested shortcut already exists it is