| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/content_settings/cookie_settings.h" | 9 #include "chrome/browser/content_settings/cookie_settings.h" |
| 10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "content/public/test/browser_test_utils.h" | 26 #include "content/public/test/browser_test_utils.h" |
| 27 #include "content/public/test/test_utils.h" | 27 #include "content/public/test/test_utils.h" |
| 28 #include "content/test/net/url_request_mock_http_job.h" | 28 #include "content/test/net/url_request_mock_http_job.h" |
| 29 #include "net/test/test_server.h" | 29 #include "net/test/test_server.h" |
| 30 | 30 |
| 31 #if defined(OS_MACOSX) | 31 #if defined(OS_MACOSX) |
| 32 #include "base/mac/scoped_nsautorelease_pool.h" | 32 #include "base/mac/scoped_nsautorelease_pool.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 using content::BrowserThread; | 35 using content::BrowserThread; |
| 36 using content::URLRequestMockHTTPJob; |
| 36 | 37 |
| 37 class ContentSettingsTest : public InProcessBrowserTest { | 38 class ContentSettingsTest : public InProcessBrowserTest { |
| 38 public: | 39 public: |
| 39 ContentSettingsTest() | 40 ContentSettingsTest() |
| 40 : https_server_( | 41 : https_server_( |
| 41 net::TestServer::TYPE_HTTPS, | 42 net::TestServer::TYPE_HTTPS, |
| 42 net::TestServer::SSLOptions(net::TestServer::SSLOptions::CERT_OK), | 43 net::TestServer::SSLOptions(net::TestServer::SSLOptions::CERT_OK), |
| 43 FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { | 44 FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { |
| 44 } | 45 } |
| 45 | 46 |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 | 427 |
| 427 content::RenderViewHost* host = | 428 content::RenderViewHost* host = |
| 428 chrome::GetActiveWebContents(browser())->GetRenderViewHost(); | 429 chrome::GetActiveWebContents(browser())->GetRenderViewHost(); |
| 429 host->Send(new ChromeViewMsg_LoadBlockedPlugins( | 430 host->Send(new ChromeViewMsg_LoadBlockedPlugins( |
| 430 host->GetRoutingID(), std::string())); | 431 host->GetRoutingID(), std::string())); |
| 431 | 432 |
| 432 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); | 433 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); |
| 433 } | 434 } |
| 434 | 435 |
| 435 #endif // !defined(USE_AURA) | 436 #endif // !defined(USE_AURA) |
| OLD | NEW |