| Index: chrome/browser/web_applications/web_app_mac.mm
|
| diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
|
| index 4ccb27fecf4eea4b2eb381edd405252ef441bb49..9199441a640622964c01bc8349fee285ddb7e67e 100644
|
| --- a/chrome/browser/web_applications/web_app_mac.mm
|
| +++ b/chrome/browser/web_applications/web_app_mac.mm
|
| @@ -47,8 +47,6 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/image/image_family.h"
|
|
|
| -bool g_app_shims_allow_update_and_launch_in_tests = false;
|
| -
|
| namespace {
|
|
|
| // Launch Services Key to run as an agent app, which doesn't launch in the dock.
|
| @@ -859,10 +857,8 @@
|
| }
|
|
|
| void MaybeLaunchShortcut(const ShortcutInfo& shortcut_info) {
|
| - if (AppShimsDisabledForTest() &&
|
| - !g_app_shims_allow_update_and_launch_in_tests) {
|
| + if (AppShimsDisabledForTest())
|
| return;
|
| - }
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::FILE, FROM_HERE,
|
| @@ -974,10 +970,8 @@
|
| const ShortcutInfo& shortcut_info,
|
| const extensions::FileHandlersInfo& file_handlers_info) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
| - if (AppShimsDisabledForTest() &&
|
| - !g_app_shims_allow_update_and_launch_in_tests) {
|
| + if (AppShimsDisabledForTest())
|
| return;
|
| - }
|
|
|
| WebAppShortcutCreator shortcut_creator(
|
| app_data_path, shortcut_info, file_handlers_info);
|
|
|