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

Side by Side Diff: chrome/browser/extensions/api/serial/serial_apitest.cc

Issue 9837045: Expand usage of platform-apps flag and permission features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 9 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 "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
7 #include "chrome/browser/extensions/api/serial/serial_api.h" 6 #include "chrome/browser/extensions/api/serial/serial_api.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_function_test_utils.h" 8 #include "chrome/browser/extensions/extension_function_test_utils.h"
10 #include "chrome/browser/extensions/extension_test_message_listener.h" 9 #include "chrome/browser/extensions/extension_test_message_listener.h"
11 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
12 #include "chrome/common/chrome_switches.h"
13 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
14 12
15 using content::BrowserThread; 13 using content::BrowserThread;
16 14
17 namespace { 15 namespace {
18 16
19 class SerialApiTest : public ExtensionApiTest { 17 class SerialApiTest : public PlatformAppApiTest {
20 public: 18 public:
21 SerialApiTest() {} 19 SerialApiTest() {}
22
23 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
24 ExtensionApiTest::SetUpCommandLine(command_line);
25 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
26 command_line->AppendSwitch(switches::kEnablePlatformApps);
27 }
28 }; 20 };
29 21
30 } // namespace 22 } // namespace
31 23
24 IN_PROC_BROWSER_TEST_F(SerialApiTest, VerifyPermissions) {
25 VerifyPermissions(test_data_dir_.AppendASCII("serial/api"));
26 }
27
32 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialExtension) { 28 IN_PROC_BROWSER_TEST_F(SerialApiTest, SerialExtension) {
33 ResultCatcher catcher; 29 ResultCatcher catcher;
34 catcher.RestrictToProfile(browser()->profile()); 30 catcher.RestrictToProfile(browser()->profile());
35 31
36 ExtensionTestMessageListener listener("serial_port", true); 32 ExtensionTestMessageListener listener("serial_port", true);
37 33
38 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("serial/api"))); 34 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("serial/api")));
39 EXPECT_TRUE(listener.WaitUntilSatisfied()); 35 EXPECT_TRUE(listener.WaitUntilSatisfied());
40 36
41 #if 0 37 #if 0
(...skipping 25 matching lines...) Expand all
67 // 63 //
68 // TODO(miket): Enable a more forgiving set of test conditions, specifically 64 // TODO(miket): Enable a more forgiving set of test conditions, specifically
69 // by mocking SerialConnection. 65 // by mocking SerialConnection.
70 listener.Reply("/dev/ttyACM0"); 66 listener.Reply("/dev/ttyACM0");
71 #else 67 #else
72 listener.Reply("none"); 68 listener.Reply("none");
73 #endif 69 #endif
74 70
75 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 71 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
76 } 72 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/dns/dns_apitest.cc ('k') | chrome/browser/extensions/api/socket/socket_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698