4 files changed, 8 insertions, 9 deletions
diff --git a/content/browser/geolocation/win7_location_api_win.h b/content/browser/geolocation/win7_location_api_win.h
index 4a33ab1..c648b8c 100644
--- a/content/browser/geolocation/win7_location_api_win.h
+++ b/content/browser/geolocation/win7_location_api_win.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2010 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_
 #define CONTENT_BROWSER_GEOLOCATION_WIN7_LOCATION_API_WIN_H_
 
+#include <windows.h>
 #include <atlbase.h>
 #include <atlcom.h>
 #include <locationapi.h>
 #include <sensors.h>
-#include <Windows.h>
 
-#include "app/win/scoped_com_initializer.h"
 #include "base/time.h"
+#include "base/win/scoped_com_initializer.h"
 
 struct Geoposition;
 
@@ -50,7 +50,7 @@ class Win7LocationApi {
   virtual bool GetPositionIfFixed(Geoposition* position);
 
   // Ensure that COM has been initialized for this thread.
-  app::win::ScopedCOMInitializer com_initializer_;
+  base::win::ScopedCOMInitializer com_initializer_;
   // ILocation object that lets us communicate with the Location and
   // Sensors platform.
   CComPtr<ILocation> locator_;
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
index 21187c6..86fdd35 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
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