[Mac]. Increment app shortcut version.

This also increments the app list shortcut version.

This will trigger a rebuild of all app shims.

This also disables updating all shortcuts in tests.

BUG=353047

Review URL: https://codereview.chromium.org/346753002

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

chrome/browser/apps/shortcut_manager.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/apps/shortcut_manager.h"
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
@@ -17,6 +18,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
@@ -33,7 +35,11 @@ namespace {
 // This version number is stored in local prefs to check whether app shortcuts
 // need to be recreated. This might happen when we change various aspects of app
 // shortcuts like command-line flags or associated icons, binaries, etc.
+#if defined(OS_MACOSX)
+const int kCurrentAppShortcutsVersion = 1;
+#else
 const int kCurrentAppShortcutsVersion = 0;
+#endif
 
 // Delay in seconds before running UpdateShortcutsForAllApps.
 const int kUpdateShortcutsForAllAppsDelay = 10;
@@ -147,6 +153,9 @@ void AppShortcutManager::OnProfileWillBeRemoved(
 }
 
 void AppShortcutManager::UpdateShortcutsForAllAppsIfNeeded() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
+    return;
+
   int last_version = prefs_->GetInteger(prefs::kAppShortcutsVersion);
   if (last_version >= kCurrentAppShortcutsVersion)
     return;

chrome/browser/ui/app_list/app_list_service_mac.mm

@@ -79,7 +79,7 @@ class ImageSkia;
 namespace {
 
 // Version of the app list shortcut version installed.
-const int kShortcutVersion = 1;
+const int kShortcutVersion = 2;
 
 // Duration of show and hide animations.
 const NSTimeInterval kAnimationDuration = 0.2;