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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 "chrome/browser/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/api/infobars/infobar_delegate.h" 11 #include "chrome/browser/api/infobars/infobar_delegate.h"
12 #include "chrome/browser/api/infobars/infobar_service.h" 12 #include "chrome/browser/api/infobars/infobar_service.h"
13 #include "chrome/browser/content_settings/content_settings_provider.h" 13 #include "chrome/browser/content_settings/content_settings_provider.h"
14 #include "chrome/browser/content_settings/content_settings_utils.h" 14 #include "chrome/browser/content_settings/content_settings_utils.h"
15 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
16 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 16 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
17 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 17 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
18 #include "chrome/common/content_settings.h" 18 #include "chrome/common/content_settings.h"
19 #include "chrome/common/content_settings_types.h" 19 #include "chrome/common/content_settings_types.h"
20 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 20 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
21 #include "chrome/test/base/testing_profile.h" 21 #include "chrome/test/base/testing_profile.h"
22 #include "content/public/browser/cert_store.h" 22 #include "content/public/browser/cert_store.h"
23 #include "content/public/common/ssl_status.h" 23 #include "content/public/common/ssl_status.h"
24 #include "content/public/test/test_browser_thread.h" 24 #include "content/public/test/test_browser_thread.h"
25 #include "net/base/cert_status_flags.h" 25 #include "net/base/cert_status_flags.h"
26 #include "net/base/ssl_connection_status_flags.h"
27 #include "net/base/test_certificate_data.h" 26 #include "net/base/test_certificate_data.h"
28 #include "net/base/x509_certificate.h" 27 #include "net/base/x509_certificate.h"
28 #include "net/ssl/ssl_connection_status_flags.h"
29 #include "testing/gmock/include/gmock/gmock.h" 29 #include "testing/gmock/include/gmock/gmock.h"
30 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
31 31
32 using content::SSLStatus; 32 using content::SSLStatus;
33 using namespace testing; 33 using namespace testing;
34 34
35 namespace { 35 namespace {
36 36
37 // SSL cipher suite like specified in RFC5246 Appendix A.5. "The Cipher Suite". 37 // SSL cipher suite like specified in RFC5246 Appendix A.5. "The Cipher Suite".
38 // Without the CR_ prefix, this clashes with the OS X 10.8 headers. 38 // Without the CR_ prefix, this clashes with the OS X 10.8 headers.
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 website_settings()->OnUIClosing(); 396 website_settings()->OnUIClosing();
397 EXPECT_EQ(1u, infobar_service()->GetInfoBarCount()); 397 EXPECT_EQ(1u, infobar_service()->GetInfoBarCount());
398 398
399 // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete 399 // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete
400 // it. Hence the |delegate| must be cleaned up after it was removed from the 400 // it. Hence the |delegate| must be cleaned up after it was removed from the
401 // |infobar_service|. 401 // |infobar_service|.
402 scoped_ptr<InfoBarDelegate> delegate( 402 scoped_ptr<InfoBarDelegate> delegate(
403 infobar_service()->GetInfoBarDelegateAt(0)); 403 infobar_service()->GetInfoBarDelegateAt(0));
404 infobar_service()->RemoveInfoBar(delegate.get()); 404 infobar_service()->RemoveInfoBar(delegate.get());
405 } 405 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698