summaryrefslogtreecommitdiffstats
path: root/content/shell/browser/shell_browser_context.h
diff options
context:
space:
mode:
authorjkarlin <jkarlin@chromium.org>2016-01-08 08:13:24 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-08 16:14:18 +0000
commit428a4a3f77ef30f1b79465c093300742fc26e846 (patch)
tree8ed8e74dbe29acbe02f4b716623205c006258e25 /content/shell/browser/shell_browser_context.h
parentb8b00f26f2fd3e0a092bedf002d002bfdc427c7e (diff)
downloadchromium_src-428a4a3f77ef30f1b79465c093300742fc26e846.zip
chromium_src-428a4a3f77ef30f1b79465c093300742fc26e846.tar.gz
chromium_src-428a4a3f77ef30f1b79465c093300742fc26e846.tar.bz2
[BackgroundSync] Disable BackgroundSync if no controller is available.
Disables background sync on init if the background sync controller doesn't exist. This means that unit and browser tests that rely on BackgroundSync need to have a mock controller available, so that is added in this CL as well. BUG=570713 Review URL: https://codereview.chromium.org/1540463004 Cr-Commit-Position: refs/heads/master@{#368342}
Diffstat (limited to 'content/shell/browser/shell_browser_context.h')
-rw-r--r--content/shell/browser/shell_browser_context.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/shell/browser/shell_browser_context.h b/content/shell/browser/shell_browser_context.h
index d5c95f6..bf40cd3 100644
--- a/content/shell/browser/shell_browser_context.h
+++ b/content/shell/browser/shell_browser_context.h
@@ -111,6 +111,7 @@ class ShellBrowserContext : public BrowserContext {
bool ignore_certificate_errors_;
scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
scoped_ptr<PermissionManager> permission_manager_;
+ scoped_ptr<BackgroundSyncController> background_sync_controller_;
private:
// Performs initialization of the ShellBrowserContext while IO is still