chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc - Issue 14556015: [Media Galleries] Lazily initialize the storage monitor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

Issue 14556015: [Media Galleries] Lazily initialize the storage monitor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix merge Created 7 years, 7 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/browser/extensions/api/media_galleries/media_galleries_api.cc ('k') | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h » ('j') | chrome/browser/storage_monitor/storage_monitor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

index 96f64c4d7489ec88218e0f9c01010ae7e43add9a..353fa9756d080cfcb4fd50b8bb0c8103bad906cb 100644

--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

@@ -81,6 +81,7 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {

}

void Attach() {

+ DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());

chrome::StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,

string16(), string16(), string16(), 0);

chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);

@@ -88,6 +89,7 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {

}

void Detach() {

+ DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());

chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(

device_id_);

content::RunAllPendingInMessageLoop();

@@ -113,6 +115,8 @@ class MediaGalleriesPrivateEjectApiTest : public ExtensionApiTest {

IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {

scoped_ptr<chrome::test::TestStorageMonitor> monitor(

chrome::test::TestStorageMonitor::CreateForBrowserTests());

+ monitor->Init();

+ monitor->MarkInitialized();

content::RenderViewHost* host = GetHost();

ExecuteCmdAndCheckReply(host, kAddAttachListenerCmd, kAddAttachListenerOk);

@@ -134,6 +138,8 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectTest) {

IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectBadDeviceTest) {

scoped_ptr<chrome::test::TestStorageMonitor> monitor(

chrome::test::TestStorageMonitor::CreateForBrowserTests());

+ monitor->Init();

+ monitor->MarkInitialized();

ExecuteCmdAndCheckReply(GetHost(), kEjectFailTestCmd, kEjectFailListenerOk);