Simplify IsRunningOnChromeOS() checks in pdf_unittests.

Consolidate the calls to base::SysInfo::IsRunningOnChromeOS(), which is
only available when OS_CHROMEOS is defined, to PDFiumTestBase. Then all
tests that are derived from PDFiumTestBase can just call
PDFiumTestBase::IsRunningOnChromeOS() and avoid having #ifs.

Change-Id: Id6da1b6b3db648ebb0dab121e48f525fd18266ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764557Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689572}

pdf/pdfium/accessibility_unittest.cc

@@ -4,7 +4,6 @@
 
 #include "pdf/accessibility.h"
 
-#include "build/build_config.h"
 #include "pdf/pdfium/pdfium_engine.h"
 #include "pdf/pdfium/pdfium_test_base.h"
 #include "pdf/test/test_client.h"
@@ -12,10 +11,6 @@
 #include "ppapi/c/private/ppp_pdf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/system/sys_info.h"
-#endif
-
 namespace chrome_pdf {
 
 using AccessibilityTest = PDFiumTestBase;
@@ -93,11 +88,7 @@ TEST_F(AccessibilityTest, GetAccessibilityPage) {
   EXPECT_EQ(links.size(), page_info.link_count);
   EXPECT_EQ(images.size(), page_info.image_count);
 
-#if defined(OS_CHROMEOS)
-  bool is_chromeos = base::SysInfo::IsRunningOnChromeOS();
-#else
-  bool is_chromeos = false;
-#endif
+  bool is_chromeos = IsRunningOnChromeOS();
 
   ASSERT_EQ(kExpectedTextRunCount, text_runs.size());
   for (size_t i = 0; i < kExpectedTextRunCount; ++i) {

pdf/pdfium/pdfium_page_unittest.cc

@@ -13,10 +13,6 @@
 #include "ppapi/c/private/ppb_pdf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/system/sys_info.h"
-#endif
-
 namespace chrome_pdf {
 
 namespace {
@@ -71,10 +67,7 @@ TEST_F(PDFiumPageLinkTest, TestLinkGeneration) {
   ASSERT_TRUE(engine);
   ASSERT_EQ(1, engine->GetNumberOfPages());
 
-  bool is_chromeos = false;
-#if defined(OS_CHROMEOS)
-  is_chromeos = base::SysInfo::IsRunningOnChromeOS();
-#endif
+  bool is_chromeos = IsRunningOnChromeOS();
 
   const std::vector<PDFiumPage::Link>& links = GetLinks(engine.get(), 0);
   ASSERT_EQ(2u, links.size());

pdf/pdfium/pdfium_test_base.cc

@@ -6,10 +6,15 @@
 
 #include <memory>
 
+#include "build/build_config.h"
 #include "pdf/pdfium/pdfium_engine.h"
 #include "pdf/test/test_client.h"
 #include "pdf/test/test_document_loader.h"
 
+#if defined(OS_CHROMEOS)
+#include "base/system/sys_info.h"
+#endif
+
 namespace chrome_pdf {
 
 namespace {
@@ -27,6 +32,15 @@ PDFiumTestBase::PDFiumTestBase() = default;
 
 PDFiumTestBase::~PDFiumTestBase() = default;
 
+// static
+bool PDFiumTestBase::IsRunningOnChromeOS() {
+#if defined(OS_CHROMEOS)
+  return base::SysInfo::IsRunningOnChromeOS();
+#else
+  return false;
+#endif
+}
+
 void PDFiumTestBase::SetUp() {
   InitializePDFium();
 }

pdf/pdfium/pdfium_test_base.h

@@ -22,6 +22,9 @@ class PDFiumTestBase : public testing::Test {
   PDFiumTestBase();
   ~PDFiumTestBase() override;
 
+  // Returns true when actually running in a Chrome OS environment.
+  static bool IsRunningOnChromeOS();
+
  protected:
   // testing::Test:
   void SetUp() override;