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

3 files changed, 27 insertions, 29 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));
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 7294e6f..e0cab31 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -952,19 +952,18 @@ void ChromeFrameAutomationClient::CreateExternalTab() {
     navigate_after_initialization_ = false;
   }
 
-  const IPC::ExternalTabSettings settings = {
-    m_hWnd,
-    gfx::Rect(),
-    WS_CHILD,
-    chrome_launch_params_->incognito(),
-    !use_chrome_network_,
-    handle_top_level_requests_,
-    chrome_launch_params_->url(),
-    chrome_launch_params_->referrer(),
-    // Infobars disabled in widget mode.
-    !chrome_launch_params_->widget_mode(),
-    chrome_launch_params_->route_all_top_level_navigations(),
-  };
+  const IPC::ExternalTabSettings settings(
+      m_hWnd,
+      gfx::Rect(),
+      WS_CHILD,
+      chrome_launch_params_->incognito(),
+      !use_chrome_network_,
+      handle_top_level_requests_,
+      chrome_launch_params_->url(),
+      chrome_launch_params_->referrer(),
+      // Infobars disabled in widget mode.
+      !chrome_launch_params_->widget_mode(),
+      chrome_launch_params_->route_all_top_level_navigations());
 
   THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS(
       "ChromeFrame.HostNetworking", !use_chrome_network_, 0, 1, 2);
@@ -1441,14 +1440,13 @@ void ChromeFrameAutomationClient::OnResponseStarted(int request_id,
     const char* mime_type,  const char* headers, int size,
     base::Time last_modified, const std::string& redirect_url,
     int redirect_status) {
-  const IPC::AutomationURLResponse response = {
+  const IPC::AutomationURLResponse response(
       mime_type,
       headers ? headers : "",
       size,
       last_modified,
       redirect_url,
-      redirect_status
-  };
+      redirect_status);
 
   automation_server_->Send(new AutomationMsg_RequestStarted(0,
       tab_->handle(), request_id, response));
diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc
index 127bec2..95b8969 100644
--- a/chrome_frame/test/url_request_test.cc
+++ b/chrome_frame/test/url_request_test.cc
@@ -260,9 +260,9 @@ TEST(UrlmonUrlRequestManagerTest, Simple1) {
 
   scoped_ptr<UrlmonUrlRequestManager> mgr(new UrlmonUrlRequestManager());
   mgr->set_delegate(&mock);
-  IPC::AutomationURLRequest r1 = {
+  IPC::AutomationURLRequest r1(
       WideToUTF8(mock_server.Resolve(L"chrome_frame_window_open.html")),
-      "get" };
+      "get", "", "", NULL, 0, 0);
 
   EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
                              testing::_, testing::_, testing::_))
@@ -293,9 +293,9 @@ TEST(UrlmonUrlRequestManagerTest, Abort1) {
 
   scoped_ptr<UrlmonUrlRequestManager> mgr(new UrlmonUrlRequestManager());
   mgr->set_delegate(&mock);
-  IPC::AutomationURLRequest r1 = {
+  IPC::AutomationURLRequest r1(
       WideToUTF8(mock_server.Resolve(L"chrome_frame_window_open.html")),
-      "get" };
+      "get", "", "", NULL, 0, 0);
 
   EXPECT_CALL(mock, OnResponseStarted(1, testing::_, testing::_, testing::_,
                                testing::_, testing::_, testing::_))
@@ -314,4 +314,3 @@ TEST(UrlmonUrlRequestManagerTest, Abort1) {
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
   mgr.reset();
 }
-