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

Side by Side Diff: chrome/browser/ui/browser_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 (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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "content/public/browser/render_widget_host_view.h" 59 #include "content/public/browser/render_widget_host_view.h"
60 #include "content/public/browser/web_contents.h" 60 #include "content/public/browser/web_contents.h"
61 #include "content/public/browser/web_contents_observer.h" 61 #include "content/public/browser/web_contents_observer.h"
62 #include "content/public/common/page_transition_types.h" 62 #include "content/public/common/page_transition_types.h"
63 #include "content/public/common/renderer_preferences.h" 63 #include "content/public/common/renderer_preferences.h"
64 #include "content/public/common/url_constants.h" 64 #include "content/public/common/url_constants.h"
65 #include "content/public/test/browser_test_utils.h" 65 #include "content/public/test/browser_test_utils.h"
66 #include "content/public/test/test_navigation_observer.h" 66 #include "content/public/test/test_navigation_observer.h"
67 #include "grit/chromium_strings.h" 67 #include "grit/chromium_strings.h"
68 #include "grit/generated_resources.h" 68 #include "grit/generated_resources.h"
69 #include "net/base/mock_host_resolver.h" 69 #include "net/dns/mock_host_resolver.h"
70 #include "net/test/test_server.h" 70 #include "net/test/test_server.h"
71 #include "ui/base/l10n/l10n_util.h" 71 #include "ui/base/l10n/l10n_util.h"
72 72
73 #if defined(OS_MACOSX) 73 #if defined(OS_MACOSX)
74 #include "base/mac/mac_util.h" 74 #include "base/mac/mac_util.h"
75 #include "base/mac/scoped_nsautorelease_pool.h" 75 #include "base/mac/scoped_nsautorelease_pool.h"
76 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 76 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
77 #endif 77 #endif
78 78
79 #if defined(OS_WIN) 79 #if defined(OS_WIN)
(...skipping 2023 matching lines...) Expand 10 before | Expand all | Expand 10 after
2103 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2103 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2104 } 2104 }
2105 2105
2106 // Shift-middle-clicks open in a foreground tab. 2106 // Shift-middle-clicks open in a foreground tab.
2107 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { 2107 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
2108 int modifiers = WebKit::WebInputEvent::ShiftKey; 2108 int modifiers = WebKit::WebInputEvent::ShiftKey;
2109 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; 2109 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
2110 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; 2110 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
2111 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 2111 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
2112 } 2112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698