Linux: Refactor printing to be more like Windows/Mac....

chrome/test/render_view_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/dom_storage_common.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
@@ skipping 240 matching lines @@
 
 void RenderViewTest::SendNativeKeyEvent(
     const NativeWebKeyboardEvent& key_event) {
   scoped_ptr<IPC::Message> input_message(new ViewMsg_HandleInputEvent(0));
   input_message->WriteData(reinterpret_cast<const char*>(&key_event),
                            sizeof(WebKit::WebKeyboardEvent));
   view_->OnMessageReceived(*input_message);
 }
 
 void RenderViewTest::VerifyPageCount(int count) {
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_CHROMEOS)
+  // The DidGetPrintedPagesCount message isn't sent on ChromeOS. Right now we
+  // always print all pages, and there are checks to that effect built into
+  // the print code.
+#else
   const IPC::Message* page_cnt_msg =
       render_thread_.sink().GetUniqueMessageMatching(
           ViewHostMsg_DidGetPrintedPagesCount::ID);
   ASSERT_TRUE(page_cnt_msg);
   ViewHostMsg_DidGetPrintedPagesCount::Param post_page_count_param;
   ViewHostMsg_DidGetPrintedPagesCount::Read(page_cnt_msg,
                                             &post_page_count_param);
   EXPECT_EQ(count, post_page_count_param.b);
-#elif defined(OS_LINUX)
-  // The DidGetPrintedPagesCount message isn't sent on Linux. Right now we
-  // always print all pages, and there are checks to that effect built into
-  // the print code.
-#endif
+#endif  // defined(OS_CHROMEOS)
 }
 
 void RenderViewTest::VerifyPagesPrinted() {
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_CHROMEOS)
+  const IPC::Message* did_print_msg =
+      render_thread_.sink().GetUniqueMessageMatching(
+          ViewHostMsg_TempFileForPrintingWritten::ID);
+  ASSERT_TRUE(did_print_msg);
+#else
   const IPC::Message* did_print_msg =
       render_thread_.sink().GetUniqueMessageMatching(
           ViewHostMsg_DidPrintPage::ID);
   ASSERT_TRUE(did_print_msg);
   ViewHostMsg_DidPrintPage::Param post_did_print_page_param;
   ViewHostMsg_DidPrintPage::Read(did_print_msg, &post_did_print_page_param);
   EXPECT_EQ(0, post_did_print_page_param.a.page_number);
-#elif defined(OS_LINUX)
-  const IPC::Message* did_print_msg =
-      render_thread_.sink().GetUniqueMessageMatching(
-          ViewHostMsg_TempFileForPrintingWritten::ID);
-  ASSERT_TRUE(did_print_msg);
-#endif
+#endif  // defined(OS_CHROMEOS)
 }
 
 const char* const kGetCoordinatesScript =
     "(function() {"
     "  function GetCoordinates(elem) {"
     "    if (!elem)"
     "      return [ 0, 0];"
     "    var coordinates = [ elem.offsetLeft, elem.offsetTop];"
     "    var parent_coordinates = GetCoordinates(elem.offsetParent);"
     "    coordinates[0] += parent_coordinates[0];"
@@ skipping 44 matching lines @@
   mouse_event.x = bounds.CenterPoint().x();
   mouse_event.y = bounds.CenterPoint().y();
   mouse_event.clickCount = 1;
   ViewMsg_HandleInputEvent input_event(0);
   scoped_ptr<IPC::Message> input_message(new ViewMsg_HandleInputEvent(0));
   input_message->WriteData(reinterpret_cast<const char*>(&mouse_event),
                            sizeof(WebMouseEvent));
   view_->OnMessageReceived(*input_message);
   return true;
 }