chrome/browser/media_galleries/media_galleries_preferences_unittest.cc - Issue 14694010: Consolidate manifest handler registration.

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/media_galleries/media_galleries_preferences_unittest.cc

Issue 14694010: Consolidate manifest handler registration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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/media_galleries/media_file_system_registry_unittest.cc ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

index 22adca149284d180bb9d4c195386bb7fff7b0536..8d4a9dfda22c1b3ca81c19646f13bc4779407560 100644

--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc

@@ -22,7 +22,6 @@

#include "chrome/browser/storage_monitor/test_storage_monitor.h"

#include "chrome/common/extensions/background_info.h"

#include "chrome/common/extensions/extension.h"

-#include "chrome/common/extensions/extension_unittest.h"

#include "chrome/test/base/testing_profile.h"

#include "content/public/test/test_browser_thread.h"

#include "sync/api/string_ordinal.h"

@@ -64,7 +63,7 @@ class MockGalleryChangeObserver

} // namespace

-class MediaGalleriesPreferencesTest : public extensions::ExtensionTest {

+class MediaGalleriesPreferencesTest : public testing::Test {

public:

typedef std::map<std::string /*device id*/, MediaGalleryPrefIdSet>

DeviceIdPrefIdsMap;

@@ -84,8 +83,6 @@ class MediaGalleriesPreferencesTest : public extensions::ExtensionTest {

}

virtual void SetUp() OVERRIDE {

- extensions::ExtensionTest::SetUp();

extensions::TestExtensionSystem* extension_system(

static_cast<extensions::TestExtensionSystem*>(

extensions::ExtensionSystem::Get(profile_.get())));

@@ -124,7 +121,6 @@ class MediaGalleriesPreferencesTest : public extensions::ExtensionTest {

virtual void TearDown() OVERRIDE {

Verify();

- extensions::ExtensionTest::TearDown();

}

void Verify() {