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

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

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/login/login_handler.h" 14 #include "chrome/browser/ui/login/login_handler.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_paths.h" 16 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/browser/web_contents_observer.h" 23 #include "content/public/browser/web_contents_observer.h"
24 #include "content/public/test/browser_test_utils.h" 24 #include "content/public/test/browser_test_utils.h"
25 #include "net/base/test_data_directory.h"
26 #include "net/test/embedded_test_server/embedded_test_server.h" 25 #include "net/test/embedded_test_server/embedded_test_server.h"
27 #include "net/test/spawned_test_server/spawned_test_server.h" 26 #include "net/test/spawned_test_server/spawned_test_server.h"
27 #include "net/test/test_data_directory.h"
28 28
29 namespace { 29 namespace {
30 30
31 // PAC script that sends all requests to an invalid proxy server. 31 // PAC script that sends all requests to an invalid proxy server.
32 const base::FilePath::CharType kPACScript[] = FILE_PATH_LITERAL( 32 const base::FilePath::CharType kPACScript[] = FILE_PATH_LITERAL(
33 "bad_server.pac"); 33 "bad_server.pac");
34 34
35 // Verify kPACScript is installed as the PAC script. 35 // Verify kPACScript is installed as the PAC script.
36 void VerifyProxyScript(Browser* browser) { 36 void VerifyProxyScript(Browser* browser) {
37 ui_test_utils::NavigateToURL(browser, GURL("http://google.com")); 37 ui_test_utils::NavigateToURL(browser, GURL("http://google.com"));
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 private: 272 private:
273 DISALLOW_COPY_AND_ASSIGN(OutOfProcessProxyResolverBrowserTest); 273 DISALLOW_COPY_AND_ASSIGN(OutOfProcessProxyResolverBrowserTest);
274 }; 274 };
275 275
276 IN_PROC_BROWSER_TEST_F(OutOfProcessProxyResolverBrowserTest, Verify) { 276 IN_PROC_BROWSER_TEST_F(OutOfProcessProxyResolverBrowserTest, Verify) {
277 VerifyProxyScript(browser()); 277 VerifyProxyScript(browser());
278 } 278 }
279 279
280 } // namespace 280 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_websocket_apitest.cc ('k') | chrome/browser/net/quota_policy_channel_id_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698