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

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

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | 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/website_settings.h" 5 #include "chrome/browser/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/content_settings/host_content_settings_map.h" 11 #include "chrome/browser/content_settings/host_content_settings_map.h"
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
13 #include "chrome/browser/ui/website_settings_ui.h" 13 #include "chrome/browser/ui/website_settings_ui.h"
14 #include "chrome/common/content_settings.h" 14 #include "chrome/common/content_settings.h"
15 #include "chrome/common/content_settings_types.h" 15 #include "chrome/common/content_settings_types.h"
16 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 16 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "content/public/browser/cert_store.h" 18 #include "content/public/browser/cert_store.h"
19 #include "content/public/common/ssl_status.h" 19 #include "content/public/common/ssl_status.h"
20 #include "content/test/test_browser_thread.h" 20 #include "content/public/test/test_browser_thread.h"
21 #include "net/base/cert_status_flags.h" 21 #include "net/base/cert_status_flags.h"
22 #include "net/base/ssl_connection_status_flags.h" 22 #include "net/base/ssl_connection_status_flags.h"
23 #include "net/base/test_certificate_data.h" 23 #include "net/base/test_certificate_data.h"
24 #include "net/base/x509_certificate.h" 24 #include "net/base/x509_certificate.h"
25 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 27
28 using content::SSLStatus; 28 using content::SSLStatus;
29 using namespace testing; 29 using namespace testing;
30 30
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 ssl_.connection_status = status; 319 ssl_.connection_status = status;
320 320
321 SetDefaultUIExpectations(mock_ui()); 321 SetDefaultUIExpectations(mock_ui());
322 322
323 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR, 323 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR,
324 website_settings()->site_connection_status()); 324 website_settings()->site_connection_status());
325 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, 325 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT,
326 website_settings()->site_identity_status()); 326 website_settings()->site_identity_status());
327 EXPECT_EQ(string16(), website_settings()->organization_name()); 327 EXPECT_EQ(string16(), website_settings()->organization_name());
328 } 328 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/web_database_migration_unittest.cc ('k') | chrome/common/metrics/experiments_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698