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

Side by Side Diff: chrome/browser/net/load_timing_observer_browsertest.cc

Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
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 "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 #include "chrome/browser/ui/browser_tabstrip.h" 6 #include "chrome/browser/ui/browser_tabstrip.h"
7 #include "chrome/test/base/in_process_browser_test.h" 7 #include "chrome/test/base/in_process_browser_test.h"
8 #include "chrome/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/test/browser_test_utils.h"
10 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
11 #include "net/test/test_server.h" 12 #include "net/test/test_server.h"
12 13
13 class LoadTimingObserverTest : public InProcessBrowserTest { 14 class LoadTimingObserverTest : public InProcessBrowserTest {
14 public: 15 public:
15 LoadTimingObserverTest() {} 16 LoadTimingObserverTest() {}
16 }; 17 };
17 18
18 // http://crbug.com/102030 19 // http://crbug.com/102030
19 IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, FLAKY_CacheHitAfterRedirect) { 20 IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, FLAKY_CacheHitAfterRedirect) {
20 ASSERT_TRUE(test_server()->Start()); 21 ASSERT_TRUE(test_server()->Start());
21 GURL cached_page = test_server()->GetURL("cachetime"); 22 GURL cached_page = test_server()->GetURL("cachetime");
22 std::string redirect = "server-redirect?" + cached_page.spec(); 23 std::string redirect = "server-redirect?" + cached_page.spec();
23 ui_test_utils::NavigateToURL(browser(), cached_page); 24 ui_test_utils::NavigateToURL(browser(), cached_page);
24 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(redirect)); 25 ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(redirect));
25 26
26 int response_start = 0; 27 int response_start = 0;
27 int response_end = 0; 28 int response_end = 0;
28 content::RenderViewHost* render_view_host = 29 content::RenderViewHost* render_view_host =
29 chrome::GetActiveWebContents(browser())->GetRenderViewHost(); 30 chrome::GetActiveWebContents(browser())->GetRenderViewHost();
30 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( 31 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
31 render_view_host, L"", 32 render_view_host, L"",
32 L"window.domAutomationController.send(" 33 L"window.domAutomationController.send("
33 L"window.performance.timing.responseStart - " 34 L"window.performance.timing.responseStart - "
34 L"window.performance.timing.navigationStart)", &response_start)); 35 L"window.performance.timing.navigationStart)", &response_start));
35 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( 36 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
36 render_view_host, L"", 37 render_view_host, L"",
37 L"window.domAutomationController.send(" 38 L"window.domAutomationController.send("
38 L"window.performance.timing.responseEnd - " 39 L"window.performance.timing.responseEnd - "
39 L"window.performance.timing.navigationStart)", &response_end)); 40 L"window.performance.timing.navigationStart)", &response_end));
40 EXPECT_LE(response_start, response_end); 41 EXPECT_LE(response_start, response_end);
41 } 42 }
OLDNEW
« no previous file with comments | « chrome/browser/loadtimes_extension_bindings_browsertest.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698