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

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

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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 "base/string_util.h" 5 #include "base/string_util.h"
6 #include "chrome/browser/search/search.h" 6 #include "chrome/browser/search/search.h"
7 #include "chrome/browser/task_manager/task_manager.h" 7 #include "chrome/browser/task_manager/task_manager.h"
8 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 8 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/host_desktop.h" 11 #include "chrome/browser/ui/host_desktop.h"
12 #include "chrome/browser/ui/omnibox/omnibox_view.h" 12 #include "chrome/browser/ui/omnibox/omnibox_view.h"
13 #include "chrome/browser/ui/search/instant_overlay.h" 13 #include "chrome/browser/ui/search/instant_overlay.h"
14 #include "chrome/browser/ui/search/instant_test_utils.h" 14 #include "chrome/browser/ui/search/instant_test_utils.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "chrome/test/base/in_process_browser_test.h" 17 #include "chrome/test/base/in_process_browser_test.h"
18 #include "chrome/test/base/interactive_test_utils.h" 18 #include "chrome/test/base/interactive_test_utils.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/browser/navigation_controller.h" 20 #include "content/public/browser/navigation_controller.h"
21 #include "content/public/browser/navigation_entry.h" 21 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/render_process_host.h" 23 #include "content/public/browser/render_process_host.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "content/public/test/browser_test_utils.h" 25 #include "content/public/test/browser_test_utils.h"
26 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
27 #include "net/base/mock_host_resolver.h" 27 #include "net/dns/mock_host_resolver.h"
28 28
29 // Instant extended tests that need to be run manually because they need to 29 // Instant extended tests that need to be run manually because they need to
30 // talk to the external network. All tests in this file should be marked as 30 // talk to the external network. All tests in this file should be marked as
31 // "MANUAL_" unless they are disabled. 31 // "MANUAL_" unless they are disabled.
32 class InstantExtendedManualTest : public InProcessBrowserTest, 32 class InstantExtendedManualTest : public InProcessBrowserTest,
33 public InstantTestBase { 33 public InstantTestBase {
34 public: 34 public:
35 InstantExtendedManualTest() { 35 InstantExtendedManualTest() {
36 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL); 36 host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
37 host_resolver_proc_->AllowDirectLookup("*"); 37 host_resolver_proc_->AllowDirectLookup("*");
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 EXPECT_EQ(ASCIIToUTF16(""), GetBlueText()); 303 EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
304 selected = true; 304 selected = true;
305 EXPECT_TRUE(GetSelectionState(&selected)); 305 EXPECT_TRUE(GetSelectionState(&selected));
306 EXPECT_FALSE(selected); 306 EXPECT_FALSE(selected);
307 307
308 // Press Enter. Instant should search for "e.co". 308 // Press Enter. Instant should search for "e.co".
309 EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle( 309 EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle(
310 instant()->GetOverlayContents(), 310 instant()->GetOverlayContents(),
311 ASCIIToUTF16("e.co - Google Search"))); 311 ASCIIToUTF16("e.co - Google Search")));
312 } 312 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698