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

Side by Side Diff: chrome/browser/ui/search/local_ntp_browsertest.cc

Issue 17413017: InstantExtended: Don't create overlay. (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 | « chrome/browser/ui/search/instant_test_utils.cc ('k') | 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/search.h" 5 #include "chrome/browser/search/search.h"
6 #include "chrome/browser/ui/search/instant_test_utils.h" 6 #include "chrome/browser/ui/search/instant_test_utils.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 7 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/test/base/in_process_browser_test.h" 8 #include "chrome/test/base/in_process_browser_test.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
11 11
12 class LocalNTPTest : public InProcessBrowserTest, 12 class LocalNTPTest : public InProcessBrowserTest,
13 public InstantTestBase { 13 public InstantTestBase {
14 public: 14 public:
15 LocalNTPTest() {} 15 LocalNTPTest() {}
16 16
17 protected: 17 protected:
18 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 18 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
19 chrome::EnableInstantExtendedAPIForTesting(); 19 chrome::EnableInstantExtendedAPIForTesting();
20 ASSERT_TRUE(https_test_server().Start()); 20 ASSERT_TRUE(https_test_server().Start());
21 GURL instant_url = https_test_server().GetURL( 21 GURL instant_url = https_test_server().GetURL(
22 "files/local_ntp_browsertest.html?strk=1&"); 22 "files/local_ntp_browsertest.html?strk=1&");
23 InstantTestBase::Init(instant_url); 23 InstantTestBase::Init(instant_url);
24 } 24 }
25 }; 25 };
26 26
27 IN_PROC_BROWSER_TEST_F(LocalNTPTest, LocalNTPJavascriptTest) { 27 IN_PROC_BROWSER_TEST_F(LocalNTPTest, LocalNTPJavascriptTest) {
28 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser())); 28 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
29 FocusOmniboxAndWaitForInstantOverlayAndNTPSupport(); 29 FocusOmniboxAndWaitForInstantNTPSupport();
30 30
31 ui_test_utils::NavigateToURLWithDisposition( 31 ui_test_utils::NavigateToURLWithDisposition(
32 browser(), 32 browser(),
33 instant_url(), 33 instant_url(),
34 NEW_FOREGROUND_TAB, 34 NEW_FOREGROUND_TAB,
35 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB | 35 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
36 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 36 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
37 content::WebContents* active_tab = 37 content::WebContents* active_tab =
38 browser()->tab_strip_model()->GetActiveWebContents(); 38 browser()->tab_strip_model()->GetActiveWebContents();
39 ASSERT_TRUE(chrome::IsInstantNTP(active_tab)); 39 ASSERT_TRUE(chrome::IsInstantNTP(active_tab));
40 bool success = false; 40 bool success = false;
41 ASSERT_TRUE(GetBoolFromJS(active_tab, "!!runTests()", &success)); 41 ASSERT_TRUE(GetBoolFromJS(active_tab, "!!runTests()", &success));
42 EXPECT_TRUE(success); 42 EXPECT_TRUE(success);
43 } 43 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698