OLD | NEW |
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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "app/message_box_flags.h" | 7 #include "app/message_box_flags.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/pref_service.h" | 10 #include "chrome/browser/pref_service.h" |
11 #include "chrome/browser/pref_value_store.h" | 11 #include "chrome/browser/pref_value_store.h" |
12 #include "chrome/browser/renderer_host/render_view_host.h" | 12 #include "chrome/browser/renderer_host/render_view_host.h" |
13 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 13 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
14 #include "chrome/browser/renderer_host/test/test_render_view_host.h" | 14 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
15 #include "chrome/browser/chrome_thread.h" | 15 #include "chrome/browser/chrome_thread.h" |
16 #include "chrome/browser/tab_contents/interstitial_page.h" | 16 #include "chrome/browser/tab_contents/interstitial_page.h" |
17 #include "chrome/browser/tab_contents/navigation_controller.h" | 17 #include "chrome/browser/tab_contents/navigation_controller.h" |
18 #include "chrome/browser/tab_contents/navigation_entry.h" | 18 #include "chrome/browser/tab_contents/navigation_entry.h" |
19 #include "chrome/browser/tab_contents/test_tab_contents.h" | 19 #include "chrome/browser/tab_contents/test_tab_contents.h" |
20 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
22 #include "chrome/common/render_messages.h" | 22 #include "chrome/common/render_messages.h" |
| 23 #include "chrome/common/render_messages_params.h" |
23 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
24 #include "chrome/test/testing_pref_service.h" | 25 #include "chrome/test/testing_pref_service.h" |
25 #include "chrome/test/testing_profile.h" | 26 #include "chrome/test/testing_profile.h" |
26 #include "ipc/ipc_channel.h" | 27 #include "ipc/ipc_channel.h" |
27 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
28 | 29 |
29 using webkit_glue::PasswordForm; | 30 using webkit_glue::PasswordForm; |
30 | 31 |
31 static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, | 32 static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, |
32 int page_id, | 33 int page_id, |
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1473 | 1474 |
1474 // While the interstitial is showing, let's simulate the hidden page | 1475 // While the interstitial is showing, let's simulate the hidden page |
1475 // attempting to show a JS message. | 1476 // attempting to show a JS message. |
1476 IPC::Message* dummy_message = new IPC::Message; | 1477 IPC::Message* dummy_message = new IPC::Message; |
1477 bool did_suppress_message = false; | 1478 bool did_suppress_message = false; |
1478 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK", | 1479 contents()->RunJavaScriptMessage(L"This is an informative message", L"OK", |
1479 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message, | 1480 kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message, |
1480 &did_suppress_message); | 1481 &did_suppress_message); |
1481 EXPECT_TRUE(did_suppress_message); | 1482 EXPECT_TRUE(did_suppress_message); |
1482 } | 1483 } |
OLD | NEW |