Move ShortcutInfo, ShortcutLocations from ShellIntegration to web_app.

chrome/browser/web_applications/update_shortcut_worker_win.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_
 #define CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_
 
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 52 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   // Underlying WebContents whose shortcuts will be updated.
   content::WebContents* web_contents_;
 
   // Icons info from web_contents_'s web app data.
   web_app::IconInfoList unprocessed_icons_;
 
   // Cached shortcut data from the web_contents_.
-  ShellIntegration::ShortcutInfo shortcut_info_;
+  web_app::ShortcutInfo shortcut_info_;
 
   // Our copy of profile path.
   base::FilePath profile_path_;
 
   // File name of shortcut/ico file based on app title.
   base::FilePath file_name_;
 
   // Existing shortcuts.
   std::vector<base::FilePath> shortcut_files_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker);
 };
 
 }  // namespace web_app
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_UPDATE_SHORTCUT_WORKER_WIN_H_