Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

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 "chrome/browser/apps/scoped_keep_alive.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_client.h"
-#include "extensions/browser/app_window/app_window_contents.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
+#include "extensions/browser/app_window/test_app_window_contents.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;
 using power::OriginPowerMapFactory;
@@ skipping 48 matching lines @@
         process_id)
 #endif
                                                 );
     return proc_handle.Pass();
   }
 
   scoped_ptr<ProcessPowerCollector> collector;
   scoped_ptr<TestingProfileManager> profile_manager_;
 };
 
-class TestAppWindowContents : public extensions::AppWindowContents {
- public:
-  explicit TestAppWindowContents(content::WebContents* web_contents)
-      : web_contents_(web_contents) {}
-
-  // apps:AppWindowContents
-  void Initialize(content::BrowserContext* context, const GURL& url) override {}
-  void LoadContents(int32 creator_process_id) override {}
-  void NativeWindowChanged(
-      extensions::NativeAppWindow* native_app_window) override {}
-  void NativeWindowClosed() override {}
-  void DispatchWindowShownForTests() const override {}
-  content::WebContents* GetWebContents() const override {
-    return web_contents_.get();
-  }
-
- private:
-  scoped_ptr<content::WebContents> web_contents_;
-};
-
 TEST_F(BrowserProcessPowerTest, NoSite) {
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(0u, collector->metrics_map_for_testing()->size());
 }
 
 TEST_F(BrowserProcessPowerTest, OneSite) {
   GURL url("http://www.google.com");
   AddTab(browser(), url);
   collector->UpdatePowerConsumptionForTesting();
   ProcessPowerCollector::ProcessMetricsMap* metrics_map =
@@ skipping 170 matching lines @@
   GURL url("chrome-extension://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   extensions::AppWindow* window = new extensions::AppWindow(
       current_profile, new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>()),
       extension.get());
   content::WebContents* web_contents(
       content::WebContents::Create(content::WebContents::CreateParams(
           current_profile,
           content::SiteInstance::CreateForURL(current_profile, url))));
   window->SetAppWindowContentsForTesting(
       scoped_ptr<extensions::AppWindowContents>(
-          new TestAppWindowContents(web_contents)));
+          new extensions::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<extensions::AppWindowContents>());
   window->OnNativeClose();
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(0u, collector->metrics_map_for_testing()->size());
 }