Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/chromeos/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.
 
 #include "chrome/browser/chromeos/preferences.h"
 
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
-#include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace {
 
 class MyMockInputMethodManager : public input_method::MockInputMethodManager {
@@ skipping 32 matching lines @@
   StringPrefMember* previous_;
   StringPrefMember* current_;
 };
 
 }  // anonymous namespace
 
 TEST(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) {
   TestingPrefServiceSyncable prefs;
   Preferences::RegisterUserPrefs(prefs.registry());
   DownloadPrefs::RegisterUserPrefs(prefs.registry());
-  ChromeDownloadManagerDelegate::RegisterUserPrefs(prefs.registry());
   // kSelectFileLastDirectory is registered for Profile. Here we register it for
   // testing.
   prefs.registry()->RegisterStringPref(
       prefs::kSelectFileLastDirectory,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   StringPrefMember previous;
   previous.Init(prefs::kLanguagePreviousInputMethod, &prefs);
   previous.SetValue("KeyboardA");
   StringPrefMember current;
   current.Init(prefs::kLanguageCurrentInputMethod, &prefs);
   current.SetValue("KeyboardB");
 
   MyMockInputMethodManager mock_manager(&previous, &current);
   Preferences testee(&mock_manager);
   testee.InitUserPrefsForTesting(&prefs);
   testee.SetInputMethodListForTesting();
 
   // Confirm they're unchanged.
   EXPECT_EQ("KeyboardA", previous.GetValue());
   EXPECT_EQ("KeyboardB", current.GetValue());
   EXPECT_EQ("KeyboardB", mock_manager.last_input_method_id_);
 }
 
 }  // namespace chromeos