Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/extensions/platform_app_browsertest.cc

Issue 12207155: Revert 182194 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/shell_window_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/platform_app_browsertest.cc
===================================================================
--- chrome/browser/extensions/platform_app_browsertest.cc (revision 182229)
+++ chrome/browser/extensions/platform_app_browsertest.cc (working copy)
@@ -28,7 +28,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/devtools_agent_host.h"
@@ -687,7 +686,7 @@
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_TRUE(GetFirstShellWindow());
- // Now tell the app to reload itself.
+ // Now tell the app to reload itself
ExtensionTestMessageListener launched_listener2("Launched", false);
launched_listener.Reply("reload");
ASSERT_TRUE(launched_listener2.WaitUntilSatisfied());
@@ -852,22 +851,4 @@
CloseShellWindow(window);
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, DontCrashWhenReloading) {
- // Regression test for http://crbug.com/174250
- browser()->profile()->GetPrefs()->SetBoolean(
- prefs::kExtensionsUIDeveloperMode, true);
- ui_test_utils::NavigateToURL(browser(), GURL("chrome://extensions"));
- ExtensionTestMessageListener launched_listener("Launched", true);
- const Extension* extension = LoadAndLaunchPlatformApp("reload");
- ASSERT_TRUE(extension);
- ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
- ASSERT_TRUE(GetFirstShellWindow());
-
- // Now tell the app to reload itself.
- ExtensionTestMessageListener launched_listener2("Launched", false);
- launched_listener.Reply("reload");
- ASSERT_TRUE(launched_listener2.WaitUntilSatisfied());
- ASSERT_TRUE(GetFirstShellWindow());
-}
-
} // namespace extensions
« no previous file with comments | « no previous file | chrome/browser/extensions/shell_window_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698