diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 07:53:34 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 07:53:34 +0000 |
| commit | 6b414c236a472dcae02bf9535d2bc71eb4f43ea4 (patch) | |
| tree | 39df96147053297ae822773a049e5c147e2013e6 /chrome/browser/extensions/convert_web_app_browsertest.cc | |
| parent | 8e4e567b488d22ec0aad82905df86b17845a0dc9 (diff) | |
| download | chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.zip chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.tar.gz chromium_src-6b414c236a472dcae02bf9535d2bc71eb4f43ea4.tar.bz2 | |
Move parsing of app.launch keys out of Extension.
Based on patch from Joe Thomas <MHX348@motorola.com>, https://chromiumcodereview.appspot.com/14241002/ .
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/15806015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/convert_web_app_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/convert_web_app_browsertest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 95e1415..bf1f816 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" +#include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/test/base/in_process_browser_test.h" @@ -81,9 +82,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, MAYBE_Basic) { EXPECT_TRUE(installed_extension_->is_hosted_app()); EXPECT_EQ("Test application", installed_extension_->name()); EXPECT_EQ("", installed_extension_->description()); - EXPECT_EQ("http://www.example.com/", installed_extension_->launch_web_url()); + EXPECT_EQ(GURL("http://www.example.com/"), + AppLaunchInfo::GetLaunchWebURL(installed_extension_)); EXPECT_EQ(extension_misc::LAUNCH_TAB, - installed_extension_->launch_container()); + AppLaunchInfo::GetLaunchContainer(installed_extension_)); EXPECT_EQ(0u, installed_extension_->GetActivePermissions()->apis().size()); EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size()); } |