Adding components to dependencies on iOS.

components/test/run_all_unittests.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
@@ skipping 79 matching lines @@
 
   void Shutdown() override {
     ui::ResourceBundle::CleanupSharedInstance();
 
     base::TestSuite::Shutdown();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ComponentsTestSuite);
 };
 
+#if !defined(OS_IOS)

[Dirk Pranke, 2015/09/09 20:37:28]

why do we need this change if we don't need it in GYP?

[sdefresne, 2015/09/10 08:45:49]

This was how it was done in the version of patchset #1 of
https://codereview.chromium.org/1330613004.
This can now be removed as https://codereview.chromium.org/1330613004 landed and
instead just protected the creation of content::TestContentClientInitializer()
instance.

 class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
  public:
   ComponentsUnitTestEventListener() {}
   ~ComponentsUnitTestEventListener() override {}
 
   void OnTestStart(const testing::TestInfo& test_info) override {
 #if !defined(OS_IOS)
     content_initializer_.reset(new content::TestContentClientInitializer());
 #endif
   }
 
   void OnTestEnd(const testing::TestInfo& test_info) override {
 #if !defined(OS_IOS)
     content_initializer_.reset();
 #endif
   }
 
  private:
 #if !defined(OS_IOS)
   scoped_ptr<content::TestContentClientInitializer> content_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ComponentsUnitTestEventListener);
 };
+#endif  // !defined(OS_IOS)
 
 }  // namespace
 
 int main(int argc, char** argv) {
   ComponentsTestSuite test_suite(argc, argv);
 
+#if !defined(OS_IOS)
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
+#endif  // !defined(OS_IOS)
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }