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

Unified Diff: chrome/test/base/testing_browser_process.h

Issue 434613003: Remove all the browser side extensions code from Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months 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/chrome_tests_unit.gypi ('k') | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.h
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index fb4e3568a94866b5ab9ec9dc5dbbf081be48d105..b12410a2cfdd7599365a267e1c7161dedb5484b5 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -166,10 +166,6 @@ class TestingBrowserProcess : public BrowserProcess {
scoped_refptr<SafeBrowsingService> sb_service_;
#endif // !defined(OS_IOS)
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
- scoped_ptr<MediaFileSystemRegistry> media_file_system_registry_;
-#endif
-
scoped_ptr<network_time::NetworkTimeTracker> network_time_tracker_;
// The following objects are not owned by TestingBrowserProcess:
@@ -179,7 +175,11 @@ class TestingBrowserProcess : public BrowserProcess {
scoped_ptr<BrowserProcessPlatformPart> platform_part_;
+#if defined(ENABLE_EXTENSIONS)
+ scoped_ptr<MediaFileSystemRegistry> media_file_system_registry_;
+
scoped_ptr<extensions::ExtensionsBrowserClient> extensions_browser_client_;
+#endif
DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
};
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698