Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Side by Side Diff: chrome/browser/extensions/convert_web_app_browsertest.cc

Issue 314113010: Remove deprecated permissions functions from Extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 14 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
15 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
16 #include "chrome/test/base/test_switches.h" 16 #include "chrome/test/base/test_switches.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/notification_details.h" 18 #include "content/public/browser/notification_details.h"
19 #include "content/public/browser/notification_observer.h" 19 #include "content/public/browser/notification_observer.h"
20 #include "content/public/browser/notification_registrar.h" 20 #include "content/public/browser/notification_registrar.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/test/browser_test_utils.h" 23 #include "content/public/test/browser_test_utils.h"
24 #include "extensions/common/extension.h" 24 #include "extensions/common/extension.h"
25 #include "extensions/common/extension_icon_set.h" 25 #include "extensions/common/extension_icon_set.h"
26 #include "extensions/common/manifest_handlers/icons_handler.h" 26 #include "extensions/common/manifest_handlers/icons_handler.h"
27 #include "extensions/common/permissions/permission_set.h" 27 #include "extensions/common/permissions/permission_set.h"
28 #include "extensions/common/permissions/permissions_data.h"
28 29
29 namespace extensions { 30 namespace extensions {
30 31
31 class ExtensionFromWebAppTest 32 class ExtensionFromWebAppTest
32 : public InProcessBrowserTest, public content::NotificationObserver { 33 : public InProcessBrowserTest, public content::NotificationObserver {
33 protected: 34 protected:
34 ExtensionFromWebAppTest() : installed_extension_(NULL) { 35 ExtensionFromWebAppTest() : installed_extension_(NULL) {
35 } 36 }
36 37
37 std::string expected_extension_id_; 38 std::string expected_extension_id_;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 content::RunMessageLoop(); 83 content::RunMessageLoop();
83 84
84 EXPECT_TRUE(installed_extension_); 85 EXPECT_TRUE(installed_extension_);
85 EXPECT_TRUE(installed_extension_->is_hosted_app()); 86 EXPECT_TRUE(installed_extension_->is_hosted_app());
86 EXPECT_EQ("Test application", installed_extension_->name()); 87 EXPECT_EQ("Test application", installed_extension_->name());
87 EXPECT_EQ("", installed_extension_->description()); 88 EXPECT_EQ("", installed_extension_->description());
88 EXPECT_EQ(GURL("http://www.example.com/"), 89 EXPECT_EQ(GURL("http://www.example.com/"),
89 AppLaunchInfo::GetLaunchWebURL(installed_extension_)); 90 AppLaunchInfo::GetLaunchWebURL(installed_extension_));
90 EXPECT_EQ(LAUNCH_CONTAINER_TAB, 91 EXPECT_EQ(LAUNCH_CONTAINER_TAB,
91 AppLaunchInfo::GetLaunchContainer(installed_extension_)); 92 AppLaunchInfo::GetLaunchContainer(installed_extension_));
92 EXPECT_EQ(0u, installed_extension_->GetActivePermissions()->apis().size()); 93 EXPECT_EQ(0u,
94 installed_extension_->permissions_data()
95 ->active_permissions()
96 ->apis()
97 .size());
93 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size()); 98 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size());
94 } 99 }
95 100
96 } // namespace extensions 101 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698