summaryrefslogtreecommitdiffstats
path: root/chrome_frame/cfproxy_test.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 17:22:28 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 17:22:28 +0000
commit0f1afed8d9f9f1849006fc6d93305d14986d16b6 (patch)
tree317787b597343760331431458fba0486bc49670f /chrome_frame/cfproxy_test.cc
parent9010941b17ea056d5dd8e28707262fa91d36b000 (diff)
downloadchromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.zip
chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.gz
chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.bz2
Keep deinlining stuff.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5783004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_test.cc')
-rw-r--r--chrome_frame/cfproxy_test.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc
index 3a99b92..ab615f7 100644
--- a/chrome_frame/cfproxy_test.cc
+++ b/chrome_frame/cfproxy_test.cc
@@ -432,8 +432,8 @@ TEST(Deserialize, DispatchTabMessage) {
// Tuple3<int, int, IPC::NavigationInfo>
int flags = 2;
- IPC::NavigationInfo ni = {2, 3, 4, L"title", url,
- ref, SECURITY_STYLE_AUTHENTICATION_BROKEN, true, true};
+ IPC::NavigationInfo ni(2, 3, 4, L"title", url,
+ ref, SECURITY_STYLE_AUTHENTICATION_BROKEN, true, true);
AutomationMsg_NavigationStateChanged m1(0, 1, flags, ni);
EXPECT_CALL(delegate, NavigationStateChanged(flags, EqNavigationInfo(ni)));
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m1));
@@ -486,9 +486,9 @@ TEST(Deserialize, DispatchTabMessage) {
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m9));
// Tuple4<int, HANDLE, int, IPC::ContextMenuParams>
- IPC::MiniContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"),
+ IPC::MiniContextMenuParams ctxmenu(711, 512, GURL("http://link_src"),
GURL("http://unfiltered_link_url"), GURL("http://src_url"),
- GURL("http://page_url"), GURL("http://frame_url") };
+ GURL("http://page_url"), GURL("http://frame_url"));
AutomationMsg_ForwardContextMenuToExternalHost m10(0, 1, HANDLE(7), 4,
ctxmenu);
EXPECT_CALL(delegate, HandleContextMenu(HANDLE(7), 4,
@@ -496,8 +496,8 @@ TEST(Deserialize, DispatchTabMessage) {
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m10));
// Tuple3<int, int, IPC::AutomationURLRequest>
- IPC::AutomationURLRequest url_request = {"url", "post", "referer",
- "extra_headers", 0, 3 };
+ IPC::AutomationURLRequest url_request("url", "post", "referer",
+ "extra_headers", 0, 3, 0);
AutomationMsg_RequestStart m11(0, 1, 7, url_request);
EXPECT_CALL(delegate, Network_Start(7, EqURLRequest(url_request)));
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m11));
@@ -523,8 +523,9 @@ TEST(Deserialize, DispatchTabMessage) {
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m15));
// Tuple2<int, IPC::AttachExternalTabParams>
- IPC::AttachExternalTabParams ext_tab = { 0xFEDCBA0987654321i64, url,
- gfx::Rect(6, 9, 123, 999), 1, false, "theprofile" };
+ IPC::AttachExternalTabParams ext_tab(0xFEDCBA0987654321i64, url,
+ gfx::Rect(6, 9, 123, 999), 1,
+ false, "theprofile");
AutomationMsg_AttachExternalTab m16(0, 1, ext_tab);
EXPECT_CALL(delegate, AttachTab(EqAttachExternalTab(ext_tab)));
EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m16));