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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_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 <map> 5 #include <map>
6 #include <memory> 6 #include <memory>
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "content/public/browser/navigation_entry.h" 49 #include "content/public/browser/navigation_entry.h"
50 #include "content/public/browser/notification_observer.h" 50 #include "content/public/browser/notification_observer.h"
51 #include "content/public/browser/notification_registrar.h" 51 #include "content/public/browser/notification_registrar.h"
52 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
53 #include "content/public/browser/notification_types.h" 53 #include "content/public/browser/notification_types.h"
54 #include "content/public/browser/render_frame_host.h" 54 #include "content/public/browser/render_frame_host.h"
55 #include "content/public/browser/web_contents.h" 55 #include "content/public/browser/web_contents.h"
56 #include "content/public/common/url_constants.h" 56 #include "content/public/common/url_constants.h"
57 #include "content/public/test/browser_test_utils.h" 57 #include "content/public/test/browser_test_utils.h"
58 #include "net/base/net_errors.h" 58 #include "net/base/net_errors.h"
59 #include "net/base/test_data_directory.h"
60 #include "net/cert/x509_certificate.h" 59 #include "net/cert/x509_certificate.h"
61 #include "net/http/transport_security_state.h" 60 #include "net/http/transport_security_state.h"
62 #include "net/test/cert_test_util.h" 61 #include "net/test/cert_test_util.h"
63 #include "net/test/embedded_test_server/embedded_test_server.h" 62 #include "net/test/embedded_test_server/embedded_test_server.h"
63 #include "net/test/test_data_directory.h"
64 #include "net/test/url_request/url_request_failed_job.h" 64 #include "net/test/url_request/url_request_failed_job.h"
65 #include "net/test/url_request/url_request_mock_http_job.h" 65 #include "net/test/url_request/url_request_mock_http_job.h"
66 #include "net/url_request/url_request.h" 66 #include "net/url_request/url_request.h"
67 #include "net/url_request/url_request_context.h" 67 #include "net/url_request/url_request_context.h"
68 #include "net/url_request/url_request_context_getter.h" 68 #include "net/url_request/url_request_context_getter.h"
69 #include "net/url_request/url_request_filter.h" 69 #include "net/url_request/url_request_filter.h"
70 #include "net/url_request/url_request_interceptor.h" 70 #include "net/url_request/url_request_interceptor.h"
71 #include "net/url_request/url_request_job.h" 71 #include "net/url_request/url_request_job.h"
72 #include "net/url_request/url_request_status.h" 72 #include "net/url_request/url_request_status.h"
73 #include "testing/gtest/include/gtest/gtest.h" 73 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 2763 matching lines...) Expand 10 before | Expand all | Expand 10 after
2837 2837
2838 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, 2838 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
2839 GetStateOfTabReloaderAt(browser(), broken_tab_index)); 2839 GetStateOfTabReloaderAt(browser(), broken_tab_index));
2840 2840
2841 WaitForInterstitialAttach(broken_tab_contents); 2841 WaitForInterstitialAttach(broken_tab_contents);
2842 portal_observer.WaitForResults(1); 2842 portal_observer.WaitForResults(1);
2843 2843
2844 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, 2844 EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
2845 GetInterstitialType(broken_tab_contents)); 2845 GetInterstitialType(broken_tab_contents));
2846 } 2846 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698