| Index: content/test/content_test_suite.cc
|
| ===================================================================
|
| --- content/test/content_test_suite.cc (revision 147803)
|
| +++ content/test/content_test_suite.cc (working copy)
|
| @@ -4,15 +4,9 @@
|
|
|
| #include "content/test/content_test_suite.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include <stdio.h>
|
| -#include <unistd.h>
|
| -#endif
|
| -
|
| #include "base/logging.h"
|
| #include "content/public/test/test_content_client_initializer.h"
|
| #include "content/test/test_content_client.h"
|
| -#include "media/base/media.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| #if defined(USE_AURA)
|
| @@ -59,19 +53,6 @@
|
| ContentTestSuite::~ContentTestSuite() {
|
| }
|
|
|
| -static bool IsCrosPythonProcess() {
|
| -#if defined(OS_CHROMEOS)
|
| - char buf[80];
|
| - int num_read = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
|
| - if (num_read == -1)
|
| - return false;
|
| - buf[num_read] = 0;
|
| - const char kPythonPrefix[] = "/python";
|
| - return !strncmp(strrchr(buf, '/'), kPythonPrefix, sizeof(kPythonPrefix) - 1);
|
| -#endif // defined(OS_CHROMEOS)
|
| - return false;
|
| -}
|
| -
|
| void ContentTestSuite::Initialize() {
|
| #if defined(OS_MACOSX)
|
| base::mac::ScopedNSAutoreleasePool autorelease_pool;
|
| @@ -79,12 +60,6 @@
|
|
|
| ContentTestSuiteBase::Initialize();
|
|
|
| - // Initialize media library for unit tests. If we are auto test
|
| - // (python process under chrome os), media library will be loaded to
|
| - // chrome directly so don't load it here.
|
| - if (!IsCrosPythonProcess())
|
| - media::InitializeMediaLibraryForTesting();
|
| -
|
| testing::TestEventListeners& listeners =
|
| testing::UnitTest::GetInstance()->listeners();
|
| listeners.Append(new TestInitializationListener);
|
|
|