Move AppWindow to extensions

chrome/browser/power/process_power_collector_unittest.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 "chrome/browser/power/process_power_collector.h"
 
 #include "apps/app_window_contents.h"
-#include "apps/app_window_registry.h"
-#include "apps/ui/apps_client.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/power/origin_power_map.h"
 #include "components/power/origin_power_map_factory.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/mock_render_process_host.h"
+#include "extensions/browser/app_window/app_window_registry.h"
+#include "extensions/browser/app_window/apps_client.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #endif
 
 using power::OriginPowerMap;
@@ skipping 49 matching lines @@
         process_id)
 #endif
                                                 );
     return proc_handle.Pass();
   }
 
   scoped_ptr<ProcessPowerCollector> collector;
   scoped_ptr<TestingProfileManager> profile_manager_;
 };
 
-class TestAppWindowContents : public apps::AppWindowContents {
+class TestAppWindowContents : public extensions::AppWindowContents {
  public:
   explicit TestAppWindowContents(content::WebContents* web_contents)
       : web_contents_(web_contents) {}
 
   // apps:AppWindowContents
   virtual void Initialize(content::BrowserContext* context,
                           const GURL& url) OVERRIDE {}
   virtual void LoadContents(int32 creator_process_id) OVERRIDE {}
   virtual void NativeWindowChanged(
       extensions::NativeAppWindow* native_app_window) OVERRIDE {}
@@ skipping 178 matching lines @@
   char kTestAppId[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
   scoped_refptr<extensions::Extension> extension(
       extensions::Extension::Create(extension_path,
                                     extensions::Manifest::INTERNAL,
                                     manifest,
                                     extensions::Extension::NO_FLAGS,
                                     kTestAppId,
                                     &error));
   EXPECT_TRUE(extension.get()) << error;
   // Increment the apps count to avoid a DCHECK later.
-  apps::AppsClient::Get()->IncrementKeepAliveCount();
+  extensions::AppsClient::Get()->IncrementKeepAliveCount();
 
   Profile* current_profile =
       profile_manager_->CreateTestingProfile("Test user");
   GURL url("chrome-extension://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-  apps::AppWindow* window = new apps::AppWindow(
+  extensions::AppWindow* window = new extensions::AppWindow(
       current_profile, new ChromeAppDelegate(), extension.get());
   content::WebContents* web_contents(
       content::WebContents::Create(content::WebContents::CreateParams(
           current_profile,
           content::SiteInstance::CreateForURL(current_profile, url))));
-  window->SetAppWindowContentsForTesting(scoped_ptr<apps::AppWindowContents>(
-      new TestAppWindowContents(web_contents)));
-  apps::AppWindowRegistry* app_registry =
-      apps::AppWindowRegistry::Get(current_profile);
+  window->SetAppWindowContentsForTesting(
+      scoped_ptr<extensions::AppWindowContents>(
+          new TestAppWindowContents(web_contents)));
+  extensions::AppWindowRegistry* app_registry =
+      extensions::AppWindowRegistry::Get(current_profile);
   app_registry->AddAppWindow(window);
 
   collector->set_cpu_usage_callback_for_testing(
       base::Bind(&BrowserProcessPowerTest::ReturnCpuAsConstant,
                  base::Unretained(this),
                  5));
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(1u, collector->metrics_map_for_testing()->size());
 
   // Clear the AppWindowContents before trying to close.
-  window->SetAppWindowContentsForTesting(scoped_ptr<apps::AppWindowContents>());
+  window->SetAppWindowContentsForTesting(
+      scoped_ptr<extensions::AppWindowContents>());
   window->OnNativeClose();
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(0u, collector->metrics_map_for_testing()->size());
 }