diff options
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 4d3ab75..1e5d9c8 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -196,7 +196,7 @@ SSLBlockingPage::~SSLBlockingPage() { } std::string SSLBlockingPage::GetHTMLContents() { - DictionaryValue strings; + base::DictionaryValue strings; int resource_id; if (overridable_ && !strict_enforcement_) { // Let's build the overridable error page. @@ -416,7 +416,7 @@ void SSLBlockingPage::NotifyAllowCertificate() { // static void SSLBlockingPage::SetExtraInfo( - DictionaryValue* strings, + base::DictionaryValue* strings, const std::vector<base::string16>& extra_info) { DCHECK_LT(extra_info.size(), 5U); // We allow 5 paragraphs max. const char* keys[5] = { diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 74a74a4..e1b2d01 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -701,7 +701,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestWSSClientCert) { // cert selection. Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext()); DCHECK(profile); - scoped_ptr<DictionaryValue> dict(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); dict->SetString("ISSUER.CN", "pywebsocket"); profile->GetHostContentSettingsMap()->SetWebsiteSetting( ContentSettingsPattern::FromURL(url), |