Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc

Issue 2023243002: Remove base::Tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint fix Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "content/browser/renderer_host/pepper/pepper_printing_host.h" 5 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <tuple>
8 #include <utility> 9 #include <utility>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "content/browser/renderer_host/pepper/browser_ppapi_host_test.h" 12 #include "content/browser/renderer_host/pepper/browser_ppapi_host_test.h"
12 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" 13 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
13 #include "ppapi/c/pp_errors.h" 14 #include "ppapi/c/pp_errors.h"
14 #include "ppapi/host/host_message_context.h" 15 #include "ppapi/host/host_message_context.h"
15 #include "ppapi/host/ppapi_host.h" 16 #include "ppapi/host/ppapi_host.h"
16 #include "ppapi/proxy/ppapi_messages.h" 17 #include "ppapi/proxy/ppapi_messages.h"
17 #include "ppapi/proxy/resource_message_params.h" 18 #include "ppapi/proxy/resource_message_params.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 &reply_params, 102 &reply_params,
102 &reply_msg)); 103 &reply_msg));
103 104
104 // Validation of reply. 105 // Validation of reply.
105 EXPECT_EQ(call_params.sequence(), reply_params.sequence()); 106 EXPECT_EQ(call_params.sequence(), reply_params.sequence());
106 EXPECT_EQ(PP_OK, reply_params.result()); 107 EXPECT_EQ(PP_OK, reply_params.result());
107 PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply::Schema::Param 108 PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply::Schema::Param
108 reply_msg_param; 109 reply_msg_param;
109 ASSERT_TRUE(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply::Read( 110 ASSERT_TRUE(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply::Read(
110 &reply_msg, &reply_msg_param)); 111 &reply_msg, &reply_msg_param));
111 PP_PrintSettings_Dev actual_settings = base::get<0>(reply_msg_param); 112 PP_PrintSettings_Dev actual_settings = std::get<0>(reply_msg_param);
112 113
113 EXPECT_TRUE(PP_RectEqual(expected_settings.printable_area, 114 EXPECT_TRUE(PP_RectEqual(expected_settings.printable_area,
114 actual_settings.printable_area)); 115 actual_settings.printable_area));
115 EXPECT_TRUE(PP_RectEqual(expected_settings.content_area, 116 EXPECT_TRUE(PP_RectEqual(expected_settings.content_area,
116 actual_settings.content_area)); 117 actual_settings.content_area));
117 EXPECT_TRUE( 118 EXPECT_TRUE(
118 PP_SizeEqual(expected_settings.paper_size, actual_settings.paper_size)); 119 PP_SizeEqual(expected_settings.paper_size, actual_settings.paper_size));
119 EXPECT_EQ(expected_settings.dpi, actual_settings.dpi); 120 EXPECT_EQ(expected_settings.dpi, actual_settings.dpi);
120 EXPECT_EQ(expected_settings.orientation, actual_settings.orientation); 121 EXPECT_EQ(expected_settings.orientation, actual_settings.orientation);
121 EXPECT_EQ(expected_settings.print_scaling_option, 122 EXPECT_EQ(expected_settings.print_scaling_option,
122 actual_settings.print_scaling_option); 123 actual_settings.print_scaling_option);
123 EXPECT_EQ(expected_settings.grayscale, actual_settings.grayscale); 124 EXPECT_EQ(expected_settings.grayscale, actual_settings.grayscale);
124 EXPECT_EQ(expected_settings.format, actual_settings.format); 125 EXPECT_EQ(expected_settings.format, actual_settings.format);
125 } 126 }
126 127
127 } // namespace content 128 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/p2p/socket_host_test_utils.h ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698