summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/content_tests.gypi2
-rw-r--r--content/test/content_test_suite.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 19c6035..2e3e4b5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -135,7 +135,7 @@
'../build/linux/system.gyp:glib',
],
}],
- ['use_webkit_compositor==1 and views_compositor==1', {
+ ['use_webkit_compositor==1', {
'dependencies': [
'../ui/gfx/compositor/compositor.gyp:compositor',
],
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index e1cecd9..ef67f6d 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 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.
@@ -89,4 +89,3 @@ void ContentTestSuite::Initialize() {
testing::UnitTest::GetInstance()->listeners();
listeners.Append(new TestContentClientInitializer);
}
-