Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6103)

Unified Diff: chrome/browser/media_gallery/media_galleries_preferences_unittest.cc

Issue 10828166: media galleries config dialog on views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 4 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
Index: chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
diff --git a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
index 4a622fa3baac9921385a99cc06a80f4f27ffa153..fc354e82d09db6f2c7268a968b6bb1c52149afd4 100644
--- a/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_gallery/media_galleries_preferences_unittest.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/media_gallery/media_file_system_registry.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/test/base/testing_profile.h"
@@ -56,8 +55,6 @@ class MediaGalleriesPreferencesTest : public testing::Test {
}
virtual void SetUp() OVERRIDE {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableMediaGalleryUI);
extensions_dir_ = profile_->GetPath().AppendASCII("Extensions");
ASSERT_TRUE(file_util::CreateDirectory(extensions_dir_));
@@ -67,7 +64,6 @@ class MediaGalleriesPreferencesTest : public testing::Test {
extension_service_ = extension_system->CreateExtensionService(
CommandLine::ForCurrentProcess(), extensions_dir_, false);
- MediaGalleriesPreferences::RegisterUserPrefs(profile_->GetPrefs());
gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
// Load the default galleries into the expectations.
« no previous file with comments | « chrome/browser/media_gallery/media_galleries_preferences.cc ('k') | chrome/browser/ui/views/constrained_window_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698