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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 1324293003: Revert of Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/extensions/extension_util.h" 25 #include "chrome/browser/extensions/extension_util.h"
26 #include "chrome/browser/extensions/tab_helper.h" 26 #include "chrome/browser/extensions/tab_helper.h"
27 #include "chrome/browser/first_run/first_run.h" 27 #include "chrome/browser/first_run/first_run.h"
28 #include "chrome/browser/lifetime/application_lifetime.h" 28 #include "chrome/browser/lifetime/application_lifetime.h"
29 #include "chrome/browser/prefs/incognito_mode_prefs.h" 29 #include "chrome/browser/prefs/incognito_mode_prefs.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/profiles/profile_info_cache.h" 31 #include "chrome/browser/profiles/profile_info_cache.h"
32 #include "chrome/browser/profiles/profile_manager.h" 32 #include "chrome/browser/profiles/profile_manager.h"
33 #include "chrome/browser/search/search.h" 33 #include "chrome/browser/search/search.h"
34 #include "chrome/browser/sessions/session_service_factory.h" 34 #include "chrome/browser/sessions/session_service_factory.h"
35 #include "chrome/browser/ssl/security_state_model.h" 35 #include "chrome/browser/ssl/connection_security.h"
36 #include "chrome/browser/translate/chrome_translate_client.h" 36 #include "chrome/browser/translate/chrome_translate_client.h"
37 #include "chrome/browser/translate/cld_data_harness.h" 37 #include "chrome/browser/translate/cld_data_harness.h"
38 #include "chrome/browser/translate/cld_data_harness_factory.h" 38 #include "chrome/browser/translate/cld_data_harness_factory.h"
39 #include "chrome/browser/ui/browser.h" 39 #include "chrome/browser/ui/browser.h"
40 #include "chrome/browser/ui/browser_command_controller.h" 40 #include "chrome/browser/ui/browser_command_controller.h"
41 #include "chrome/browser/ui/browser_commands.h" 41 #include "chrome/browser/ui/browser_commands.h"
42 #include "chrome/browser/ui/browser_finder.h" 42 #include "chrome/browser/ui/browser_finder.h"
43 #include "chrome/browser/ui/browser_iterator.h" 43 #include "chrome/browser/ui/browser_iterator.h"
44 #include "chrome/browser/ui/browser_navigator.h" 44 #include "chrome/browser/ui/browser_navigator.h"
45 #include "chrome/browser/ui/browser_tabstrip.h" 45 #include "chrome/browser/ui/browser_tabstrip.h"
(...skipping 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after
3125 EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, 3125 EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED,
3126 observer.latest_security_style()); 3126 observer.latest_security_style());
3127 EXPECT_EQ(0u, observer.latest_explanations().warning_explanations.size()); 3127 EXPECT_EQ(0u, observer.latest_explanations().warning_explanations.size());
3128 EXPECT_EQ(0u, observer.latest_explanations().broken_explanations.size()); 3128 EXPECT_EQ(0u, observer.latest_explanations().broken_explanations.size());
3129 CheckSecureExplanations(observer.latest_explanations().secure_explanations, 3129 CheckSecureExplanations(observer.latest_explanations().secure_explanations,
3130 VALID_CERTIFICATE, browser()); 3130 VALID_CERTIFICATE, browser());
3131 EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic); 3131 EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
3132 EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content); 3132 EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
3133 EXPECT_FALSE(observer.latest_explanations().ran_insecure_content); 3133 EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
3134 } 3134 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698