| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index bec3309d882d87349595a6e8867a5203fc5f8a14..be4944ecf867e6ad426980cfcca088fe99e60121 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1259,9 +1259,9 @@ void ChromeContentBrowserClient::SelectClientCertificate(
|
| const std::vector<scoped_refptr<net::X509Certificate> >&
|
| all_client_certs = cert_request_info->client_certs;
|
| for (size_t i = 0; i < all_client_certs.size(); ++i) {
|
| - if (CertMatchesFilter(*all_client_certs[i], *filter_dict)) {
|
| + if (CertMatchesFilter(*all_client_certs[i].get(), *filter_dict)) {
|
| // Use the first certificate that is matched by the filter.
|
| - callback.Run(all_client_certs[i]);
|
| + callback.Run(all_client_certs[i].get());
|
| return;
|
| }
|
| }
|
| @@ -1563,7 +1563,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
|
|
|
| // The user stylesheet watcher may not exist in a testing profile.
|
| UserStyleSheetWatcher* user_style_sheet_watcher =
|
| - UserStyleSheetWatcherFactory::GetForProfile(profile);
|
| + UserStyleSheetWatcherFactory::GetForProfile(profile).get();
|
| if (user_style_sheet_watcher) {
|
| web_prefs->user_style_sheet_enabled = true;
|
| web_prefs->user_style_sheet_location =
|
|
|