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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 1018343002: Disable BrowserTest.ShouldShowLocationBarForBookmarkApp on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 1382
1383 EXPECT_FALSE( 1383 EXPECT_FALSE(
1384 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)); 1384 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
1385 EXPECT_FALSE( 1385 EXPECT_FALSE(
1386 app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)); 1386 app_browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
1387 1387
1388 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); 1388 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
1389 } 1389 }
1390 1390
1391 // Check that the location bar is shown correctly for bookmark apps. 1391 // Check that the location bar is shown correctly for bookmark apps.
1392 IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBarForBookmarkApp) { 1392 // Flaky on Windows: http://crbug.com/468753.
1393 #if defined(OS_WIN)
1394 #define MAYBE_ShouldShowLocationBarForBookmarkApp \
1395 DISABLED_ShouldShowLocationBarForBookmarkApp
1396 #else
1397 #define MAYBE_ShouldShowLocationBarForBookmarkApp \
1398 ShouldShowLocationBarForBookmarkApp
1399 #endif
1400 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ShouldShowLocationBarForBookmarkApp) {
1393 base::CommandLine::ForCurrentProcess()->AppendSwitch( 1401 base::CommandLine::ForCurrentProcess()->AppendSwitch(
1394 switches::kEnableNewBookmarkApps); 1402 switches::kEnableNewBookmarkApps);
1395 ASSERT_TRUE(test_server()->Start()); 1403 ASSERT_TRUE(test_server()->Start());
1396 1404
1397 // Setup the test server. 1405 // Setup the test server.
1398 host_resolver()->AddRule("www.foo.com", "127.0.0.1"); 1406 host_resolver()->AddRule("www.foo.com", "127.0.0.1");
1399 host_resolver()->AddRule("www.example.com", "127.0.0.1"); 1407 host_resolver()->AddRule("www.example.com", "127.0.0.1");
1400 1408
1401 // Load a http bookmark app. 1409 // Load a http bookmark app.
1402 const Extension* http_bookmark_app = InstallExtensionWithSourceAndFlags( 1410 const Extension* http_bookmark_app = InstallExtensionWithSourceAndFlags(
(...skipping 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
2901 #endif 2909 #endif
2902 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2910 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2903 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2911 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2904 gfx::Size exp_final_size(initial_wcv_size); 2912 gfx::Size exp_final_size(initial_wcv_size);
2905 exp_final_size.Enlarge(wcv_resize_insets.width(), 2913 exp_final_size.Enlarge(wcv_resize_insets.width(),
2906 wcv_resize_insets.height() + height_inset); 2914 wcv_resize_insets.height() + height_inset);
2907 EXPECT_EQ(exp_final_size, 2915 EXPECT_EQ(exp_final_size,
2908 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2916 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2909 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2917 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2910 } 2918 }
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