| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/gpu/compositor_util.h" | 5 #include "content/browser/gpu/compositor_util.h" |
| 6 #include "content/test/content_browser_test.h" | 6 #include "content/public/test/content_browser_test.h" |
| 7 | 7 |
| 8 #if defined(OS_MACOSX) | 8 #if defined(OS_MACOSX) |
| 9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
| 10 #elif defined(OS_WIN) | 10 #elif defined(OS_WIN) |
| 11 #include "base/win/windows_version.h" | 11 #include "base/win/windows_version.h" |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 typedef ContentBrowserTest CompositorUtilTest; | 16 typedef ContentBrowserTest CompositorUtilTest; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 46 expected_mode == DELEGATED, | 46 expected_mode == DELEGATED, |
| 47 IsForceCompositingModeEnabled()); | 47 IsForceCompositingModeEnabled()); |
| 48 EXPECT_EQ(expected_mode == THREADED || | 48 EXPECT_EQ(expected_mode == THREADED || |
| 49 expected_mode == DELEGATED, | 49 expected_mode == DELEGATED, |
| 50 IsThreadedCompositingEnabled()); | 50 IsThreadedCompositingEnabled()); |
| 51 EXPECT_EQ(expected_mode == DELEGATED, | 51 EXPECT_EQ(expected_mode == DELEGATED, |
| 52 IsDelegatedRendererEnabled()); | 52 IsDelegatedRendererEnabled()); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } | 55 } |
| OLD | NEW |