Keep deinlining stuff.

chrome_frame/cfproxy_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include "base/file_path.h"
 #include "base/waitable_event.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome_frame/cfproxy_private.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 414 matching lines @@
 }
 
 TEST(Deserialize, DispatchTabMessage) {
   testing::InSequence s;
   StrictMock<MockChromeProxyDelegate> delegate;
   GURL url("http://destination");
   GURL ref("http://referer");
 
   // 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));
 
   // Tuple2<int, std::wstring>
   AutomationMsg_UpdateTargetUrl m2(0, 1, L"hello");
   EXPECT_CALL(delegate, UpdateTargetUrl(StrEq(L"hello")));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m2));
 
   // Tuple2<int, MSG>
@@ skipping 32 matching lines @@
 
   // Tuple4<int, string, string, string>
   std::string msg("Load oranges barrels");
   std::string origin("Brothers Karamazov");
   std::string target("Alexander Ivanovich");
   AutomationMsg_ForwardMessageToExternalHost m9(0, 1, msg, origin, target);
   EXPECT_CALL(delegate, MessageToHost(msg, origin, target));
   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,
                                           EqContextMenuParam(ctxmenu)));
   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));
 
   // Tuple3<int, int, int>
   AutomationMsg_RequestRead m12(0, 1, 7, 16384);
   EXPECT_CALL(delegate, Network_Read(7, 16384));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m12));
 
   // Tuple3<int, int, URLRequestStatus>
   AutomationMsg_RequestEnd m13(0, 1, 7, URLRequestStatus());
   EXPECT_CALL(delegate, Network_End(7, _));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m13));
 
   // Tuple2<int, int>
   AutomationMsg_DownloadRequestInHost m14(0, 1, 7);
   EXPECT_CALL(delegate, Network_DownloadInHost(7));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m14));
 
   // Tuple3<int, GURL, string>
   AutomationMsg_SetCookieAsync m15(0, 1, url, "cake=big");
   EXPECT_CALL(delegate, SetCookie(url, "cake=big"));
   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));
 
   // Tuple2<int, int>
   AutomationMsg_RequestGoToHistoryEntryOffset m17(0, 1, -4);
   EXPECT_CALL(delegate, GoToHistoryOffset(-4));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m17));
 
   // Tuple3<int, GURL, int>
   AutomationMsg_GetCookiesFromHost m18(0, 1, url, 903);
   EXPECT_CALL(delegate, GetCookies(url, 903));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m18));
 
   AutomationMsg_CloseExternalTab m19(0, 1);
   EXPECT_CALL(delegate, TabClosed());
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m19));
 }