chrome/browser/media_galleries/media_galleries_preferences_unittest.cc - Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries.

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 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nit Created 7 years, 3 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_galleries_preferences_factory.cc ('k') | chrome/browser/media_galleries/media_galleries_test_util.h » ('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 68edbd9846e8d065748443962379a6a90af90ace..de3b7f5aa3ea0e3a79f8dc8f85cf4a1b8a5b1f10 100644

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

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

@@ -33,8 +33,6 @@

#include "chrome/browser/chromeos/settings/device_settings_service.h"

#endif

-namespace chrome {

namespace {

class MockGalleryChangeObserver

@@ -79,7 +77,7 @@ class MediaGalleriesPreferencesTest : public testing::Test {

}

virtual void SetUp() OVERRIDE {

- ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());

+ ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());

extensions::TestExtensionSystem* extension_system(

static_cast<extensions::TestExtensionSystem*>(

@@ -119,7 +117,7 @@ class MediaGalleriesPreferencesTest : public testing::Test {

virtual void TearDown() OVERRIDE {

Verify();

- test::TestStorageMonitor::RemoveSingleton();

+ TestStorageMonitor::RemoveSingleton();

}

void Verify() {

@@ -242,7 +240,7 @@ class MediaGalleriesPreferencesTest : public testing::Test {

chromeos::ScopedTestUserManager test_user_manager_;

#endif

- test::TestStorageMonitor monitor_;

+ TestStorageMonitor monitor_;

scoped_ptr<TestingProfile> profile_;

scoped_ptr<MediaGalleriesPreferences> gallery_prefs_;

@@ -806,7 +804,7 @@ TEST_F(MediaGalleriesPreferencesTest, UpdateSingletonDeviceIdType) {

}

TEST(MediaGalleryPrefInfoTest, NameGeneration) {

- ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());

+ ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());

MediaGalleryPrefInfo info;

info.pref_id = 1;

@@ -846,7 +844,5 @@ TEST(MediaGalleryPrefInfoTest, NameGeneration) {

EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),

UTF16ToUTF8(info.GetGalleryTooltip()));

- test::TestStorageMonitor::RemoveSingleton();

+ TestStorageMonitor::RemoveSingleton();

}

-} // namespace chrome