Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

Issue 1103403002: gpu: Fix dependency cycle between service_sources and config_sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zmo nits Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "content/browser/gpu/gpu_data_manager_impl_private.h" 9 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
10 #include "content/public/browser/gpu_data_manager_observer.h" 10 #include "content/public/browser/gpu_data_manager_observer.h"
11 #include "gpu/command_buffer/service/gpu_switches.h"
12 #include "gpu/config/gpu_feature_type.h" 11 #include "gpu/config/gpu_feature_type.h"
13 #include "gpu/config/gpu_info.h" 12 #include "gpu/config/gpu_info.h"
13 #include "gpu/config/gpu_switches.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "url/gurl.h" 15 #include "url/gurl.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "base/win/windows_version.h" 18 #include "base/win/windows_version.h"
19 #endif 19 #endif
20 20
21 #define LONG_STRING_CONST(...) #__VA_ARGS__ 21 #define LONG_STRING_CONST(...) #__VA_ARGS__
22 22
23 namespace content { 23 namespace content {
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1)); 745 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
746 { 746 {
747 base::RunLoop run_loop; 747 base::RunLoop run_loop;
748 run_loop.RunUntilIdle(); 748 run_loop.RunUntilIdle();
749 } 749 }
750 EXPECT_TRUE(observer.gpu_info_updated()); 750 EXPECT_TRUE(observer.gpu_info_updated());
751 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); 751 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
752 } 752 }
753 753
754 } // namespace content 754 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698