Moved app shortcut code out of ExtensionService.

chrome/browser/web_applications/web_app.cc

 // Copyright (c) 2011 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/web_applications/web_app.h"
 
 #if defined(OS_WIN)
 #include <shlobj.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 18 matching lines @@
 #endif
 
 #if defined(OS_WIN)
 #include "ui/gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
 using content::BrowserThread;
 
 namespace {
 
-// Allow tests to disable shortcut creation, to prevent developers desktops
-// becoming overrun with shortcuts.
-bool disable_shortcut_creation_for_tests = false;
-
 #if defined(OS_WIN)
 const FilePath::CharType kIconChecksumFileExt[] = FILE_PATH_LITERAL(".ico.md5");
 
 // Returns true if |ch| is in visible ASCII range and not one of
 // "/ \ : * ? " < > | ; ,".
 bool IsValidFilePathChar(char16 c) {
   if (c < 32)
     return false;
 
   switch (c) {
@@ skipping 98 matching lines @@
                 sizeof(base::MD5Digest)) != 0;
 }
 
 #endif  // defined(OS_WIN)
 
 void CreateShortcutTask(const FilePath& web_app_path,
                         const FilePath& profile_path,
                         const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
-  if (disable_shortcut_creation_for_tests)
-    return;
-
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   std::string shortcut_template;
   if (!ShellIntegration::GetDesktopShortcutTemplate(env.get(),
                                                     &shortcut_template)) {
     return;
   }
   ShellIntegration::CreateDesktopShortcut(shortcut_info, shortcut_template);
   return;  // assuming always success.
@@ skipping 249 matching lines @@
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&CreateShortcutTask,
                  web_app::internals::GetWebAppDataDirectory(
                     web_app::GetDataDir(data_dir),
                     shortcut_info),
                  data_dir,
                  shortcut_info));
 }
 
-void SetDisableShortcutCreationForTests(bool disable) {
-  disable_shortcut_creation_for_tests = disable;
-}
-
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
       chrome::kFileScheme,
       chrome::kFtpScheme,
       chrome::kHttpScheme,
       chrome::kHttpsScheme,
       chrome::kExtensionScheme,
   };
 
   for (size_t i = 0; i < arraysize(kValidUrlSchemes); ++i) {
@@ skipping 27 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app