Fix a bug where an AppWindow* was not being properly deleted in the BrowserProcessPowerTest.AppsRec…

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"
@@ skipping 259 matching lines @@
   std::string error;
   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();
 
   Profile* current_profile =
       profile_manager_->CreateTestingProfile("Test user");
   GURL url("chrome-extension://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   apps::AppWindow* window =
       new apps::AppWindow(current_profile, new ChromeAppDelegate(), extension);
-  scoped_ptr<content::WebContents> web_contents(
+  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.get())));
+      new TestAppWindowContents(web_contents)));
   apps::AppWindowRegistry* app_registry =
       apps::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());
 
-  app_registry->RemoveAppWindow(window);
+  // Clear the AppWindowContents before trying to close.
+  window->SetAppWindowContentsForTesting(scoped_ptr<apps::AppWindowContents>());
+  window->OnNativeClose();
   collector->UpdatePowerConsumptionForTesting();
   EXPECT_EQ(0u, collector->metrics_map_for_testing()->size());
 }