summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_child_thread.cc4
-rw-r--r--content/gpu/gpu_main.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index ec62d13..62336cc 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -7,9 +7,9 @@
#include <string>
#include <vector>
-#include "app/win/scoped_com_initializer.h"
#include "base/command_line.h"
#include "base/threading/worker_pool.h"
+#include "base/win/scoped_com_initializer.h"
#include "build/build_config.h"
#include "content/common/child_process.h"
#include "content/common/content_client.h"
@@ -259,7 +259,7 @@ void GpuChildThread::OnHang() {
// Runs on a worker thread. The GPU process never terminates voluntarily so
// it is safe to assume that its message loop is valid.
void GpuChildThread::CollectDxDiagnostics(GpuChildThread* thread) {
- app::win::ScopedCOMInitializer com_initializer;
+ base::win::ScopedCOMInitializer com_initializer;
DxDiagNode node;
gpu_info_collector::GetDxDiagnostics(&node);
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 422175c..cea11e6 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -8,11 +8,11 @@
#include <windows.h>
#endif
-#include "app/win/scoped_com_initializer.h"
#include "base/environment.h"
#include "base/message_loop.h"
#include "base/stringprintf.h"
#include "base/threading/platform_thread.h"
+#include "base/win/scoped_com_initializer.h"
#include "build/build_config.h"
#include "content/common/content_switches.h"
#include "content/common/gpu/gpu_config.h"
@@ -57,7 +57,7 @@ int GpuMain(const MainFunctionParams& parameters) {
#endif
}
- app::win::ScopedCOMInitializer com_initializer;
+ base::win::ScopedCOMInitializer com_initializer;
// We can not tolerate early returns from this code, because the
// detection of early return of a child process is implemented using