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

Side by Side Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 2813533002: Reenable DevToolsSanityTest.TestToolboxLoadedUndocked on Linux (Closed)
Patch Set: Created 3 years, 8 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
« 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 std::string("window.location = \"") + url.spec() + "\"")); 1724 std::string("window.location = \"") + url.spec() + "\""));
1725 observer.Wait(); 1725 observer.Wait();
1726 1726
1727 ASSERT_TRUE(main_web_contents()->GetURL(). 1727 ASSERT_TRUE(main_web_contents()->GetURL().
1728 SchemeIs(content::kChromeDevToolsScheme)); 1728 SchemeIs(content::kChromeDevToolsScheme));
1729 ASSERT_EQ(url, GetInspectedTab()->GetURL()); 1729 ASSERT_EQ(url, GetInspectedTab()->GetURL());
1730 CloseDevToolsWindow(); 1730 CloseDevToolsWindow();
1731 } 1731 }
1732 1732
1733 // Tests that toolbox window is loaded when DevTools window is undocked. 1733 // Tests that toolbox window is loaded when DevTools window is undocked.
1734 // Crashes on Linux only. https://crbug.com/702641 1734 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestToolboxLoadedUndocked) {
1735 #if defined(OS_LINUX)
1736 #define MAYBE_TestToolboxLoadedUndocked DISABLED_TestToolboxLoadedUndocked
1737 #else
1738 #define MAYBE_TestToolboxLoadedUndocked TestToolboxLoadedUndocked
1739 #endif
1740 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestToolboxLoadedUndocked) {
1741 OpenDevToolsWindow(kDebuggerTestPage, false); 1735 OpenDevToolsWindow(kDebuggerTestPage, false);
1742 ASSERT_TRUE(toolbox_web_contents()); 1736 ASSERT_TRUE(toolbox_web_contents());
1743 DevToolsWindow* on_self = 1737 DevToolsWindow* on_self =
1744 DevToolsWindowTesting::OpenDevToolsWindowSync(main_web_contents(), false); 1738 DevToolsWindowTesting::OpenDevToolsWindowSync(main_web_contents(), false);
1745 ASSERT_FALSE(DevToolsWindowTesting::Get(on_self)->toolbox_web_contents()); 1739 ASSERT_FALSE(DevToolsWindowTesting::Get(on_self)->toolbox_web_contents());
1746 DevToolsWindowTesting::CloseDevToolsWindowSync(on_self); 1740 DevToolsWindowTesting::CloseDevToolsWindowSync(on_self);
1747 CloseDevToolsWindow(); 1741 CloseDevToolsWindow();
1748 } 1742 }
1749 1743
1750 // Tests that toolbox window is not loaded when DevTools window is docked. 1744 // Tests that toolbox window is not loaded when DevTools window is docked.
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 #if defined(OS_MACOSX) 2255 #if defined(OS_MACOSX)
2262 faker.FinishTransition(); 2256 faker.FinishTransition();
2263 #endif 2257 #endif
2264 CheckIsFullscreen(true); 2258 CheckIsFullscreen(true);
2265 SendCommand("normal"); 2259 SendCommand("normal");
2266 #if defined(OS_MACOSX) 2260 #if defined(OS_MACOSX)
2267 faker.FinishTransition(); 2261 faker.FinishTransition();
2268 #endif 2262 #endif
2269 CheckIsFullscreen(false); 2263 CheckIsFullscreen(false);
2270 } 2264 }
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