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

Unified Diff: chrome/test/in_process_browser_test.h

Issue 4947002: Mac: Let browser_tests run in bundled mode for their whole lifetime. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: test Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pepper_plugin_registry.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/in_process_browser_test.h
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index 67658b59c80e4b0ec58d24b6c56984860d465587..444519bf3962c370c0d600a4783c93d884e2feb0 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -110,7 +110,7 @@ class InProcessBrowserTest : public testing::Test {
virtual void CleanUpOnMainThread() {}
// Returns the testing server. Guaranteed to be non-NULL.
- net::TestServer* test_server() { return &test_server_; }
+ net::TestServer* test_server() { return test_server_.get(); }
// Creates a browser with a single tab (about:blank), waits for the tab to
// finish loading and shows the browser.
@@ -153,7 +153,7 @@ class InProcessBrowserTest : public testing::Test {
Browser* browser_;
// Testing server, started on demand.
- net::TestServer test_server_;
+ scoped_ptr<net::TestServer> test_server_;
// Whether this test requires the browser windows to be shown (interactive
// tests for example need the windows shown).
« no previous file with comments | « chrome/common/pepper_plugin_registry.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698