Moved app shortcut code out of ExtensionService.

chrome/browser/extensions/extension_browsertest.cc

 // Copyright (c) 2012 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/extensions/extension_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 43 matching lines @@
   command_line->AppendSwitchASCII(switches::kLoginUser,
                                   "TestUser@gmail.com");
   command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
   command_line->AppendSwitch(switches::kNoFirstRun);
 #endif
 }
 
 const Extension* ExtensionBrowserTest::LoadExtensionWithOptions(
     const FilePath& path, bool incognito_enabled, bool fileaccess_enabled) {
   ExtensionService* service = browser()->profile()->GetExtensionService();
+  service->app_shortcut_manager()->set_disable_shortcut_creation(true);
   {
     content::NotificationRegistrar registrar;
     registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                   content::NotificationService::AllSources());
     scoped_refptr<extensions::UnpackedInstaller> installer(
         extensions::UnpackedInstaller::Create(service));
     installer->set_prompt_for_plugins(false);
     installer->Load(path);
     ui_test_utils::RunMessageLoop();
   }
@@ skipping 180 matching lines @@
 
 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     const std::string& id,
     const FilePath& path,
     InstallUIType ui_type,
     int expected_change,
     Profile* profile,
     bool from_webstore) {
   ExtensionService* service = profile->GetExtensionService();
   service->set_show_extensions_prompts(false);
+  service->app_shortcut_manager()->set_disable_shortcut_creation(true);

[Aaron Boodman, 2012/02/05 05:45:27]

A better chokepoint might be ExtensionBrowserTest's constructor (and unset in
destructor for when browser tests are run in-process)?

[benwells, 2012/02/06 05:01:48]

When the test is being constructed there is no browser (or profile etc.)
available. When its getting destroyed the browser() is still around but trying
to use the profile causes crashes.

An alternative would be to add Setup / Teardown to EBT. I can investigate this
more, but the shortcut manager gets recreated for each test when run in-process;
maybe it is OK as it is.

[benwells, 2012/02/07 06:57:01]

I've changed how the disabling works, its now done in single place (and feels
better).

   size_t num_before = service->extensions()->size();
 
   {
     ExtensionInstallUI* install_ui = NULL;
     if (ui_type == INSTALL_UI_TYPE_CANCEL)
       install_ui = new MockAbortExtensionInstallUI();
     else if (ui_type == INSTALL_UI_TYPE_NORMAL)
       install_ui = new ExtensionInstallUI(profile);
     else if (ui_type == INSTALL_UI_TYPE_AUTO_CONFIRM)
       install_ui = new MockAutoConfirmExtensionInstallUI(profile);
@@ skipping 230 matching lines @@
         MessageLoopForUI::current()->Quit();
       }
       break;
     }
 
     default:
       NOTREACHED();
       break;
   }
 }