| OLD | NEW |
| 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/base64.h" | 5 #include "base/base64.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 127 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 128 ExtensionApiTest::SetUpCommandLine(command_line); | 128 ExtensionApiTest::SetUpCommandLine(command_line); |
| 129 command_line->AppendSwitch(switches::kEnablePanels); | 129 command_line->AppendSwitch(switches::kEnablePanels); |
| 130 } | 130 } |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 IN_PROC_BROWSER_TEST_F(PanelMessagingTest, MessagingPanel) { | 133 IN_PROC_BROWSER_TEST_F(PanelMessagingTest, MessagingPanel) { |
| 134 ASSERT_TRUE(RunExtensionTest("messaging/connect_panel")) << message_; | 134 ASSERT_TRUE(RunExtensionTest("messaging/connect_panel")) << message_; |
| 135 } | 135 } |
| 136 | 136 |
| 137 // XXX(kalman): All web messaging tests disabled on windows due to extreme |
| 138 // flakiness. See http://crbug.com/350517. |
| 139 #if !defined(OS_WIN) |
| 140 |
| 137 // Tests externally_connectable between a web page and an extension. | 141 // Tests externally_connectable between a web page and an extension. |
| 138 // | 142 // |
| 139 // TODO(kalman): Test between extensions. This is already tested in this file, | 143 // TODO(kalman): Test between extensions. This is already tested in this file, |
| 140 // but not with externally_connectable set in the manifest. | 144 // but not with externally_connectable set in the manifest. |
| 141 // | 145 // |
| 142 // TODO(kalman): Test with host permissions. | 146 // TODO(kalman): Test with host permissions. |
| 143 class ExternallyConnectableMessagingTest : public ExtensionApiTest { | 147 class ExternallyConnectableMessagingTest : public ExtensionApiTest { |
| 144 protected: | 148 protected: |
| 145 // Result codes from the test. These must match up with |results| in | 149 // Result codes from the test. These must match up with |results| in |
| 146 // c/t/d/extensions/api_test/externally_connectable/assertions.json. | 150 // c/t/d/extensions/api_test/externally_connectable/assertions.json. |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 // The presence of the chromium hosted app triggers this bug. The chromium | 950 // The presence of the chromium hosted app triggers this bug. The chromium |
| 947 // connectable extension needs to be installed to set up the runtime bindings. | 951 // connectable extension needs to be installed to set up the runtime bindings. |
| 948 LoadChromiumHostedApp(); | 952 LoadChromiumHostedApp(); |
| 949 LoadChromiumConnectableExtension(); | 953 LoadChromiumConnectableExtension(); |
| 950 | 954 |
| 951 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); | 955 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); |
| 952 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR , | 956 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR , |
| 953 CanConnectAndSendMessages("invalid")); | 957 CanConnectAndSendMessages("invalid")); |
| 954 } | 958 } |
| 955 | 959 |
| 960 #endif // !defined(OS_WIN) - http://crbug.com/350517. |
| 961 |
| 956 } // namespace | 962 } // namespace |
| 957 | 963 |
| 958 }; // namespace extensions | 964 }; // namespace extensions |
| OLD | NEW |