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

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

Issue 11778010: Re-enable the messaging/connect extension API test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/values.h" 5 #include "base/values.h"
6 #include "chrome/browser/extensions/event_router.h" 6 #include "chrome/browser/extensions/event_router.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_system.h" 8 #include "chrome/browser/extensions/extension_system.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 content::Source<Profile>(source).ptr(), 70 content::Source<Profile>(source).ptr(),
71 GURL())); 71 GURL()));
72 } 72 }
73 73
74 content::NotificationRegistrar registrar_; 74 content::NotificationRegistrar registrar_;
75 }; 75 };
76 76
77 } // namespace 77 } // namespace
78 78
79 // Tests that message passing between extensions and content scripts works. 79 // Tests that message passing between extensions and content scripts works.
80 // Flaky on the trybots. See http://crbug.com/96725. 80 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) {
81 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Messaging) {
82 ASSERT_TRUE(StartTestServer()); 81 ASSERT_TRUE(StartTestServer());
83 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; 82 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_;
84 } 83 }
85 84
86 // Tests that message passing from one extension to another works. 85 // Tests that message passing from one extension to another works.
87 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingExternal) { 86 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingExternal) {
88 ASSERT_TRUE(LoadExtension( 87 ASSERT_TRUE(LoadExtension(
89 test_data_dir_.AppendASCII("..").AppendASCII("good") 88 test_data_dir_.AppendASCII("..").AppendASCII("good")
90 .AppendASCII("Extensions") 89 .AppendASCII("Extensions")
91 .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa") 90 .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
(...skipping 13 matching lines...) Expand all
105 class PanelMessagingTest : public ExtensionApiTest { 104 class PanelMessagingTest : public ExtensionApiTest {
106 virtual void SetUpCommandLine(CommandLine* command_line) { 105 virtual void SetUpCommandLine(CommandLine* command_line) {
107 ExtensionApiTest::SetUpCommandLine(command_line); 106 ExtensionApiTest::SetUpCommandLine(command_line);
108 command_line->AppendSwitch(switches::kEnablePanels); 107 command_line->AppendSwitch(switches::kEnablePanels);
109 } 108 }
110 }; 109 };
111 110
112 IN_PROC_BROWSER_TEST_F(PanelMessagingTest, MessagingPanel) { 111 IN_PROC_BROWSER_TEST_F(PanelMessagingTest, MessagingPanel) {
113 ASSERT_TRUE(RunExtensionTest("messaging/connect_panel")) << message_; 112 ASSERT_TRUE(RunExtensionTest("messaging/connect_panel")) << message_;
114 } 113 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698