Make AppWindowWaiter a common test support

chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

 // Copyright 2014 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.
 
+#include "apps/test/app_window_waiter.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
-#include "chrome/browser/chromeos/login/test/app_window_waiter.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 17 matching lines @@
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_SESSION_STARTED,
         content::NotificationService::AllSources()).Wait();
   }
 
   return ProfileManager::GetActiveUserProfile();
 }
 
 bool VerifyDemoAppLaunch() {
   Profile* profile = WaitForProfile();
-  return AppWindowWaiter(extensions::AppWindowRegistry::Get(profile),
-                         DemoAppLauncher::kDemoAppId).Wait() != NULL;
+  return apps::AppWindowWaiter(extensions::AppWindowRegistry::Get(profile),
+                               DemoAppLauncher::kDemoAppId)
+             .Wait() != NULL;
 }
 
 bool VerifyNetworksDisabled() {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   return !handler->FirstNetworkByType(NetworkTypePattern::NonVirtual());
 }
 
 }  // namespace
 
 class DemoAppLauncherTest : public ExtensionBrowserTest {
@@ skipping 30 matching lines @@
   // did launch.
   EXPECT_TRUE(VerifyDemoAppLaunch());
 }
 
 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) {
   EXPECT_TRUE(VerifyDemoAppLaunch());
   EXPECT_TRUE(VerifyNetworksDisabled());
 }
 
 }  // namespace chromeos