Moved app shortcut code out of ExtensionService.

chrome/browser/extensions/extension_browsertest.cc

Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index f1f2597d8e8a2dd5ca385894e6e83972a78a6885..1fcc6788167ddb619f7e12d3e3356d37c8497408 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -61,6 +61,7 @@ void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
 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,
@@ -261,6 +262,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
     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();
 
   {