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

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

Issue 3462011: Manual merge of 60334 - Add a launchApp method to extension management API.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/517/src/
Patch Set: Created 10 years, 3 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 #include "chrome/browser/extensions/extension_test_message_listener.h" 6 #include "chrome/browser/extensions/extension_test_message_listener.h"
7 #include "chrome/common/chrome_switches.h" 7 #include "chrome/common/chrome_switches.h"
8 8
9 9
10 class ExtensionManagementApiBrowserTest : public ExtensionBrowserTest { 10 class ExtensionManagementApiBrowserTest : public ExtensionBrowserTest {
(...skipping 10 matching lines...) Expand all
21 ExtensionTestMessageListener listener1("ready"); 21 ExtensionTestMessageListener listener1("ready");
22 ASSERT_TRUE(LoadExtension( 22 ASSERT_TRUE(LoadExtension(
23 test_data_dir_.AppendASCII("management/install_event"))); 23 test_data_dir_.AppendASCII("management/install_event")));
24 ASSERT_TRUE(listener1.WaitUntilSatisfied()); 24 ASSERT_TRUE(listener1.WaitUntilSatisfied());
25 25
26 ExtensionTestMessageListener listener2("got_event"); 26 ExtensionTestMessageListener listener2("got_event");
27 ASSERT_TRUE(LoadExtension( 27 ASSERT_TRUE(LoadExtension(
28 test_data_dir_.AppendASCII("api_test/management/enabled_extension"))); 28 test_data_dir_.AppendASCII("api_test/management/enabled_extension")));
29 ASSERT_TRUE(listener2.WaitUntilSatisfied()); 29 ASSERT_TRUE(listener2.WaitUntilSatisfied());
30 } 30 }
31
32 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, LaunchApp) {
33 ExtensionTestMessageListener listener1("app_launched");
34 ExtensionTestMessageListener listener2("got_expected_error");
35 ASSERT_TRUE(LoadExtension(
36 test_data_dir_.AppendASCII("management/simple_extension")));
37 ASSERT_TRUE(LoadExtension(
38 test_data_dir_.AppendASCII("management/packaged_app")));
39 ASSERT_TRUE(LoadExtension(
40 test_data_dir_.AppendASCII("management/launch_app")));
41 ASSERT_TRUE(listener1.WaitUntilSatisfied());
42 ASSERT_TRUE(listener2.WaitUntilSatisfied());
43 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_management_api.cc ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698