media galleries config dialog on views

chrome/browser/media_gallery/media_galleries_preferences_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
 
 namespace {
 
@@ skipping 18 matching lines @@
   }
 
   virtual ~MediaGalleriesPreferencesTest() {
     // TestExtensionSystem uses DeleteSoon, so we need to delete the profile
     // and then run the message queue to clean up.
     profile_.reset();
     MessageLoop::current()->RunAllPending();
   }
 
   virtual void SetUp() OVERRIDE {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableMediaGalleryUI);
     extensions_dir_ = profile_->GetPath().AppendASCII("Extensions");
     ASSERT_TRUE(file_util::CreateDirectory(extensions_dir_));
 
     extensions::TestExtensionSystem* extension_system(
         static_cast<extensions::TestExtensionSystem*>(
             extensions::ExtensionSystem::Get(profile_.get())));
     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.
     if (gallery_prefs_->known_galleries().size()) {
       const MediaGalleriesPrefInfoMap& known_galleries =
           gallery_prefs_->known_galleries();
       ASSERT_EQ(1U, known_galleries.size());
       default_galleries_count_ = 1;
       MediaGalleriesPrefInfoMap::const_iterator it = known_galleries.begin();
       expected_galleries_[it->first] = it->second;
@@ skipping 414 matching lines @@
   // Check that adding one of them again works as expected.
   MediaGalleryPrefId id = gallery_prefs()->AddGallery(
       device_id, ASCIIToUTF16("Device2Path2"), path, true /*user*/);
   EXPECT_EQ(dev2_path2_id, id);
   Verify();
 }
 
 }  // namespace
 
 }  // namespace chrome