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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 2694813005: Revert of Remove header dependencies from sequence_checker.h to sequenced_worker_pool.h (Closed)
Patch Set: Created 3 years, 10 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>
11 11
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "base/threading/sequenced_worker_pool.h"
22 #include "base/values.h" 21 #include "base/values.h"
23 #include "build/build_config.h" 22 #include "build/build_config.h"
24 #include "chrome/browser/captive_portal/captive_portal_service.h" 23 #include "chrome/browser/captive_portal/captive_portal_service.h"
25 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 24 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
26 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 25 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
27 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h" 26 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
28 #include "chrome/browser/chrome_notification_types.h" 27 #include "chrome/browser/chrome_notification_types.h"
29 #include "chrome/browser/net/url_request_mock_util.h" 28 #include "chrome/browser/net/url_request_mock_util.h"
30 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/ssl/captive_portal_blocking_page.h" 30 #include "chrome/browser/ssl/captive_portal_blocking_page.h"
(...skipping 2809 matching lines...) Expand 10 before | Expand all | Expand 10 after
2841 2840
2842 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD, 2841 EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
2843 GetStateOfTabReloaderAt(browser(), broken_tab_index)); 2842 GetStateOfTabReloaderAt(browser(), broken_tab_index));
2844 2843
2845 WaitForInterstitialAttach(broken_tab_contents); 2844 WaitForInterstitialAttach(broken_tab_contents);
2846 portal_observer.WaitForResults(1); 2845 portal_observer.WaitForResults(1);
2847 2846
2848 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, 2847 EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
2849 GetInterstitialType(broken_tab_contents)); 2848 GetInterstitialType(broken_tab_contents));
2850 } 2849 }
OLDNEW
« no previous file with comments | « chrome/browser/budget_service/budget_manager.cc ('k') | chrome/browser/chrome_browser_main_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698