| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/browser/prerender/prerender_final_status.h" | 11 #include "chrome/browser/prerender/prerender_final_status.h" |
| 12 #include "chrome/browser/prerender/prerender_manager.h" | 12 #include "chrome/browser/prerender/prerender_manager.h" |
| 13 #include "chrome/browser/prerender/prerender_manager_factory.h" | 13 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 17 #include "chrome/browser/ui/webui/web_ui_browsertest.h" | 17 #include "chrome/browser/ui/webui/web_ui_browsertest.h" |
| 18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
| 19 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
| 20 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 21 #include "content/browser/renderer_host/render_view_host.h" | 21 #include "content/browser/renderer_host/render_view_host.h" |
| 22 #include "content/browser/tab_contents/tab_contents.h" | 22 #include "content/browser/tab_contents/tab_contents.h" |
| 23 #include "content/public/browser/web_ui_message_handler.h" |
| 23 #include "content/test/test_browser_thread.h" | 24 #include "content/test/test_browser_thread.h" |
| 24 #include "googleurl/src/gurl.h" | 25 #include "googleurl/src/gurl.h" |
| 25 #include "net/base/address_list.h" | 26 #include "net/base/address_list.h" |
| 26 #include "net/base/host_cache.h" | 27 #include "net/base/host_cache.h" |
| 27 #include "net/base/host_resolver.h" | 28 #include "net/base/host_resolver.h" |
| 28 #include "net/base/host_resolver_proc.h" | 29 #include "net/base/host_resolver_proc.h" |
| 29 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
| 30 #include "net/base/net_log.h" | 31 #include "net/base/net_log.h" |
| 31 #include "net/url_request/url_request_context.h" | 32 #include "net/url_request/url_request_context.h" |
| 32 #include "net/url_request/url_request_context_getter.h" | 33 #include "net/url_request/url_request_context_getter.h" |
| 33 #include "testing/gtest/include/gtest/gtest.h" | 34 #include "testing/gtest/include/gtest/gtest.h" |
| 34 | 35 |
| 35 using content::BrowserThread; | 36 using content::BrowserThread; |
| 37 using content::WebUIMessageHandler; |
| 36 | 38 |
| 37 namespace { | 39 namespace { |
| 38 | 40 |
| 39 // Called on IO thread. Adds an entry to the cache for the specified hostname. | 41 // Called on IO thread. Adds an entry to the cache for the specified hostname. |
| 40 // Either |net_error| must be net::OK, or |address| must be NULL. | 42 // Either |net_error| must be net::OK, or |address| must be NULL. |
| 41 void AddCacheEntryOnIOThread(net::URLRequestContextGetter* context_getter, | 43 void AddCacheEntryOnIOThread(net::URLRequestContextGetter* context_getter, |
| 42 const std::string& hostname, | 44 const std::string& hostname, |
| 43 const std::string& ip_literal, | 45 const std::string& ip_literal, |
| 44 int net_error, | 46 int net_error, |
| 45 int expire_days_from_now) { | 47 int expire_days_from_now) { |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 // log_view_painter.js | 543 // log_view_painter.js |
| 542 //////////////////////////////////////////////////////////////////////////////// | 544 //////////////////////////////////////////////////////////////////////////////// |
| 543 | 545 |
| 544 // Check that we correctly remove cookies and login information. | 546 // Check that we correctly remove cookies and login information. |
| 545 IN_PROC_BROWSER_TEST_F(NetInternalsTest, | 547 IN_PROC_BROWSER_TEST_F(NetInternalsTest, |
| 546 NetInternalsLogViewPainterStripInfo) { | 548 NetInternalsLogViewPainterStripInfo) { |
| 547 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo")); | 549 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo")); |
| 548 } | 550 } |
| 549 | 551 |
| 550 } // namespace | 552 } // namespace |
| OLD | NEW |