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

Unified Diff: chrome/test/base/chrome_test_suite.cc

Issue 11418005: Get a minimal unit_tests target building and running for iOS (Closed) Base URL: http://git.chromium.org/chromium/src.git@chrome-gyp-ios-support
Patch Set: Better ifdefing in chrome_paths Created 8 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_constants.gyp ('k') | chrome/test/base/testing_browser_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_test_suite.cc
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index d6f6dffde5e6de98dd071df9dfb51d6aeee69895..eda2544a7dc27ef7af93599908f9388b08bbfc3c 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -131,8 +131,11 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
DCHECK(!content::GetContentClient());
content_client_.reset(new chrome::ChromeContentClient);
+ // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
+#if !defined(OS_IOS)
browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
content_client_->set_browser_for_testing(browser_content_client_.get());
+#endif
content::SetContentClient(content_client_.get());
SetUpHostResolver();
@@ -145,7 +148,10 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
}
DCHECK_EQ(content_client_.get(), content::GetContentClient());
+ // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
+#if !defined(OS_IOS)
browser_content_client_.reset();
+#endif
content_client_.reset();
content::SetContentClient(NULL);
@@ -167,7 +173,10 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
scoped_ptr<BrowserProcess> browser_process_;
scoped_ptr<chrome::ChromeContentClient> content_client_;
+ // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
+#if !defined(OS_IOS)
scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_;
+#endif
scoped_refptr<LocalHostResolverProc> host_resolver_proc_;
scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_;
« no previous file with comments | « chrome/common_constants.gyp ('k') | chrome/test/base/testing_browser_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698