Move the parsing of app.launch related keys out of Extension class.

chrome/browser/autocomplete/extension_app_provider.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/autocomplete/extension_app_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/app_launcher_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionAppProvider::ExtensionAppProvider(
     AutocompleteProviderListener* listener,
     Profile* profile)
     : AutocompleteProvider(listener, profile,
           AutocompleteProvider::TYPE_EXTENSION_APP) {
   // Notifications of extensions loading and unloading always come from the
@@ skipping 125 matching lines @@
     const extensions::Extension* app = *iter;
     if (!app->ShouldDisplayInAppLauncher())
       continue;
     // Note: Apps that appear in the NTP only are not added here since this
     // provider is currently only used in the app launcher.
 
     if (profile_->IsOffTheRecord() &&
         !extension_service->CanLoadInIncognito(app))
       continue;
 
-    GURL launch_url =
-        app->is_platform_app() ? app->url() : app->GetFullLaunchURL();
+    GURL launch_url = app->is_platform_app() ?
+        app->url() : extensions::AppLauncherInfo::GetFullLaunchURL(app);
     DCHECK(launch_url.is_valid());
 
     ExtensionApp extension_app = {
         UTF8ToUTF16(app->name()),
         UTF8ToUTF16(launch_url.spec()),
         // Only hosted apps have recognizable URLs that users might type in,
         // packaged apps and hosted apps use chrome-extension:// URLs that are
         // normally not shown to users.
         app->is_hosted_app()
     };
@@ skipping 36 matching lines @@
     history::URLRow info;
     url_db->GetRowForURL(url, &info);
     type_count_boost =
         400 * (1.0 - (std::pow(static_cast<double>(2), -info.typed_count())));
   }
   int relevance = 575 + static_cast<int>(type_count_boost) +
                         static_cast<int>(fraction_boost);
   DCHECK_LE(relevance, kMaxRelevance);
   return relevance;
 }