2 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.cc b/chrome/browser/chromeos/login/test/app_window_waiter.cc
index f9be212..75a3397 100644
--- a/chrome/browser/chromeos/login/test/app_window_waiter.cc
+++ b/chrome/browser/chromeos/login/test/app_window_waiter.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/chromeos/login/test/app_window_waiter.h"
 
-#include "apps/app_window.h"
+#include "extensions/browser/app_window/app_window.h"
 
 namespace chromeos {
 
-AppWindowWaiter::AppWindowWaiter(apps::AppWindowRegistry* registry,
+AppWindowWaiter::AppWindowWaiter(extensions::AppWindowRegistry* registry,
                                  const std::string& app_id)
     : registry_(registry), app_id_(app_id), window_(NULL) {
   registry_->AddObserver(this);
@@ -18,7 +18,7 @@ AppWindowWaiter::~AppWindowWaiter() {
   registry_->RemoveObserver(this);
 }
 
-apps::AppWindow* AppWindowWaiter::Wait() {
+extensions::AppWindow* AppWindowWaiter::Wait() {
   window_ = registry_->GetCurrentAppWindowForApp(app_id_);
   if (window_)
     return window_;
@@ -28,7 +28,7 @@ apps::AppWindow* AppWindowWaiter::Wait() {
   return window_;
 }
 
-void AppWindowWaiter::OnAppWindowAdded(apps::AppWindow* app_window) {
+void AppWindowWaiter::OnAppWindowAdded(extensions::AppWindow* app_window) {
   if (!run_loop_.running())
     return;
 
diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.h b/chrome/browser/chromeos/login/test/app_window_waiter.h
index 3e796de..91eadcd 100644
--- a/chrome/browser/chromeos/login/test/app_window_waiter.h
+++ b/chrome/browser/chromeos/login/test/app_window_waiter.h
@@ -7,12 +7,12 @@
 
 #include <string>
 
-#include "apps/app_window_registry.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 
-namespace apps {
+namespace extensions {
 class AppWindow;
 }
 
@@ -20,22 +20,22 @@ namespace chromeos {
 
 // Helper class that monitors app windows to wait for a window to appear.
 // Use a new instance for each use, one instance will only work for one Wait.
-class AppWindowWaiter : public apps::AppWindowRegistry::Observer {
+class AppWindowWaiter : public extensions::AppWindowRegistry::Observer {
  public:
-  AppWindowWaiter(apps::AppWindowRegistry* registry,
+  AppWindowWaiter(extensions::AppWindowRegistry* registry,
                   const std::string& app_id);
   virtual ~AppWindowWaiter();
 
-  apps::AppWindow* Wait();
+  extensions::AppWindow* Wait();
 
   // AppWindowRegistry::Observer:
-  virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE;
 
  private:
-  apps::AppWindowRegistry* registry_;
+  extensions::AppWindowRegistry* registry_;
   std::string app_id_;
   base::RunLoop run_loop_;
-  apps::AppWindow* window_;
+  extensions::AppWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(AppWindowWaiter);
 };