| Index: content/browser/ssl/ssl_policy.cc
|
| ===================================================================
|
| --- content/browser/ssl/ssl_policy.cc (revision 118703)
|
| +++ content/browser/ssl/ssl_policy.cc (working copy)
|
| @@ -12,7 +12,7 @@
|
| #include "base/string_util.h"
|
| #include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| -#include "content/browser/site_instance.h"
|
| +#include "content/browser/site_instance_impl.h"
|
| #include "content/browser/ssl/ssl_cert_error_handler.h"
|
| #include "content/browser/ssl/ssl_request_info.h"
|
| #include "content/browser/tab_contents/navigation_entry_impl.h"
|
| @@ -92,7 +92,7 @@
|
| if (!entry)
|
| return;
|
|
|
| - SiteInstance* site_instance = entry->site_instance();
|
| + content::SiteInstance* site_instance = entry->site_instance();
|
| if (!site_instance)
|
| return;
|
|
|
| @@ -144,7 +144,7 @@
|
| return;
|
| }
|
|
|
| - SiteInstance* site_instance = entry->site_instance();
|
| + content::SiteInstance* site_instance = entry->site_instance();
|
| // Note that |site_instance| can be NULL here because NavigationEntries don't
|
| // necessarily have site instances. Without a process, the entry can't
|
| // possibly have insecure content. See bug http://crbug.com/12423.
|
|
|