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 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
984 chromium_connectable.get(), true, close_background_message()); | 984 chromium_connectable.get(), true, close_background_message()); |
985 EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); | 985 EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); |
986 // A subsequent connect will still succeed, even if the background page was | 986 // A subsequent connect will still succeed, even if the background page was |
987 // previously closed. | 987 // previously closed. |
988 tls_channel_id = | 988 tls_channel_id = |
989 GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); | 989 GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); |
990 // And the expected value is still retrieved. | 990 // And the expected value is still retrieved. |
991 EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); | 991 EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); |
992 } | 992 } |
993 | 993 |
994 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingUserGesture) { | 994 // FIXME: Enable after https://codereview.chromium.org/518633002/ lands |
| 995 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_MessagingUserGesture) { |
995 const char kManifest[] = "{" | 996 const char kManifest[] = "{" |
996 " \"name\": \"user_gesture\"," | 997 " \"name\": \"user_gesture\"," |
997 " \"version\": \"1.0\"," | 998 " \"version\": \"1.0\"," |
998 " \"background\": {" | 999 " \"background\": {" |
999 " \"scripts\": [\"background.js\"]" | 1000 " \"scripts\": [\"background.js\"]" |
1000 " }," | 1001 " }," |
1001 " \"manifest_version\": 2" | 1002 " \"manifest_version\": 2" |
1002 "}"; | 1003 "}"; |
1003 | 1004 |
1004 TestExtensionDir receiver_dir; | 1005 TestExtensionDir receiver_dir; |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1081 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); | 1082 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); |
1082 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, | 1083 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, |
1083 CanConnectAndSendMessagesToMainFrame(invalid.get())); | 1084 CanConnectAndSendMessagesToMainFrame(invalid.get())); |
1084 } | 1085 } |
1085 | 1086 |
1086 #endif // !defined(OS_WIN) - http://crbug.com/350517. | 1087 #endif // !defined(OS_WIN) - http://crbug.com/350517. |
1087 | 1088 |
1088 } // namespace | 1089 } // namespace |
1089 | 1090 |
1090 }; // namespace extensions | 1091 }; // namespace extensions |
OLD | NEW |