summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_message_bubble_controller.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 23:36:14 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 23:36:14 +0000
commitf24baf1ffd492635647ecddcff4411386856aea2 (patch)
treee8818d678d55b3af0d26d2c8c85a9887c38979fe /chrome/browser/extensions/extension_message_bubble_controller.cc
parent7b6ccea224b94d050f0d36b8a473cb7492f76c21 (diff)
downloadchromium_src-f24baf1ffd492635647ecddcff4411386856aea2.zip
chromium_src-f24baf1ffd492635647ecddcff4411386856aea2.tar.gz
chromium_src-f24baf1ffd492635647ecddcff4411386856aea2.tar.bz2
Build fix
TBR=asargent BUG=328441 Review URL: https://codereview.chromium.org/115493003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_bubble_controller.cc')
-rw-r--r--chrome/browser/extensions/extension_message_bubble_controller.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 90935c1..bf7ecc4 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -130,6 +130,9 @@ void ExtensionMessageBubbleController::AcknowledgeExtensions() {
}
ExtensionIdList* ExtensionMessageBubbleController::GetOrCreateExtensionList() {
+ if (!service_)
+ return &extension_list_; // Can occur during testing.
+
if (!initialized_) {
scoped_ptr<const ExtensionSet> extension_set(
service_->GenerateInstalledExtensionsSet());