Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: chrome/browser/ui/webui/net_internals_ui_browsertest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/net_internals_ui.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 13 matching lines...) Expand all
24 #include "net/base/address_list.h" 24 #include "net/base/address_list.h"
25 #include "net/base/host_cache.h" 25 #include "net/base/host_cache.h"
26 #include "net/base/host_resolver.h" 26 #include "net/base/host_resolver.h"
27 #include "net/base/host_resolver_proc.h" 27 #include "net/base/host_resolver_proc.h"
28 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
29 #include "net/base/net_log.h" 29 #include "net/base/net_log.h"
30 #include "net/url_request/url_request_context.h" 30 #include "net/url_request/url_request_context.h"
31 #include "net/url_request/url_request_context_getter.h" 31 #include "net/url_request/url_request_context_getter.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 33
34 using content::BrowserThread;
35
34 namespace { 36 namespace {
35 37
36 // Called on IO thread. Adds an entry to the cache for the specified hostname. 38 // Called on IO thread. Adds an entry to the cache for the specified hostname.
37 // Either |net_error| must be net::OK, or |address| must be NULL. 39 // Either |net_error| must be net::OK, or |address| must be NULL.
38 void AddCacheEntryOnIOThread(net::URLRequestContextGetter* context_getter, 40 void AddCacheEntryOnIOThread(net::URLRequestContextGetter* context_getter,
39 const std::string& hostname, 41 const std::string& hostname,
40 const std::string& ip_literal, 42 const std::string& ip_literal,
41 int net_error, 43 int net_error,
42 int expire_days_from_now) { 44 int expire_days_from_now) {
43 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); 45 ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 // log_view_painter.js 420 // log_view_painter.js
419 //////////////////////////////////////////////////////////////////////////////// 421 ////////////////////////////////////////////////////////////////////////////////
420 422
421 // Check that we correctly remove cookies and login information. 423 // Check that we correctly remove cookies and login information.
422 IN_PROC_BROWSER_TEST_F(NetInternalsTest, 424 IN_PROC_BROWSER_TEST_F(NetInternalsTest,
423 NetInternalsLogViewPainterStripInfo) { 425 NetInternalsLogViewPainterStripInfo) {
424 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo")); 426 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo"));
425 } 427 }
426 428
427 } // namespace 429 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/net_internals_ui.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698