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

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest.cc

Issue 15979028: Disable PlatformAppDevToolsBrowserTest.ReOpenedWithID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 693
694 // DevTools should have reopened with the relaunch. 694 // DevTools should have reopened with the relaunch.
695 rvh = window->web_contents()->GetRenderViewHost(); 695 rvh = window->web_contents()->GetRenderViewHost();
696 ASSERT_TRUE(rvh); 696 ASSERT_TRUE(rvh);
697 ASSERT_TRUE(DevToolsAgentHost::HasFor(rvh)); 697 ASSERT_TRUE(DevToolsAgentHost::HasFor(rvh));
698 } 698 }
699 } 699 }
700 700
701 } // namespace 701 } // namespace
702 702
703 IN_PROC_BROWSER_TEST_F(PlatformAppDevToolsBrowserTest, ReOpenedWithID) { 703 // http://crbug.com/246634
704 #if defined(OS_CHROMEOS)
705 #define MAYBE_ReOpenedWithID DISABLED_ReOpenedWithID
706 #else
707 #define MAYBE_ReOpenedWithID ReOpenedWithID
708 #endif
709 IN_PROC_BROWSER_TEST_F(PlatformAppDevToolsBrowserTest, MAYBE_ReOpenedWithID) {
704 RunTestWithDevTools("minimal_id", RELAUNCH | HAS_ID); 710 RunTestWithDevTools("minimal_id", RELAUNCH | HAS_ID);
705 } 711 }
706 712
707 IN_PROC_BROWSER_TEST_F(PlatformAppDevToolsBrowserTest, ReOpenedWithURL) { 713 IN_PROC_BROWSER_TEST_F(PlatformAppDevToolsBrowserTest, ReOpenedWithURL) {
708 RunTestWithDevTools("minimal", RELAUNCH); 714 RunTestWithDevTools("minimal", RELAUNCH);
709 } 715 }
710 716
711 // Test that showing a permission request as a constrained window works and is 717 // Test that showing a permission request as a constrained window works and is
712 // correctly parented. 718 // correctly parented.
713 #if defined(OS_MACOSX) 719 #if defined(OS_MACOSX)
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 987
982 while (!ContainsKey(opener_app_ids_, file_manager->id())) { 988 while (!ContainsKey(opener_app_ids_, file_manager->id())) {
983 content::RunAllPendingInMessageLoop(); 989 content::RunAllPendingInMessageLoop();
984 } 990 }
985 } 991 }
986 992
987 #endif // defined(OS_CHROMEOS) 993 #endif // defined(OS_CHROMEOS)
988 994
989 995
990 } // namespace extensions 996 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698