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

Side by Side Diff: chrome/browser/chromeos/preferences_unittest.cc

Issue 13892002: Apply the namespace migration for "selectfile.last_directory" user-pref as well. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittest 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include "base/prefs/pref_member.h" 7 #include "base/prefs/pref_member.h"
8 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 8 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
9 #include "chrome/browser/download/download_prefs.h" 9 #include "chrome/browser/download/download_prefs.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/testing_pref_service_syncable.h" 11 #include "chrome/test/base/testing_pref_service_syncable.h"
12 #include "components/user_prefs/pref_registry_syncable.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 14
14 namespace chromeos { 15 namespace chromeos {
15 namespace { 16 namespace {
16 17
17 class MyMockInputMethodManager : public input_method::MockInputMethodManager { 18 class MyMockInputMethodManager : public input_method::MockInputMethodManager {
18 public: 19 public:
19 MyMockInputMethodManager(StringPrefMember* previous, 20 MyMockInputMethodManager(StringPrefMember* previous,
20 StringPrefMember* current) 21 StringPrefMember* current)
21 : previous_(previous), 22 : previous_(previous),
(...skipping 28 matching lines...) Expand all
50 StringPrefMember* previous_; 51 StringPrefMember* previous_;
51 StringPrefMember* current_; 52 StringPrefMember* current_;
52 }; 53 };
53 54
54 } // anonymous namespace 55 } // anonymous namespace
55 56
56 TEST(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) { 57 TEST(PreferencesTest, TestUpdatePrefOnBrowserScreenDetails) {
57 TestingPrefServiceSyncable prefs; 58 TestingPrefServiceSyncable prefs;
58 Preferences::RegisterUserPrefs(prefs.registry()); 59 Preferences::RegisterUserPrefs(prefs.registry());
59 DownloadPrefs::RegisterUserPrefs(prefs.registry()); 60 DownloadPrefs::RegisterUserPrefs(prefs.registry());
61 // kSelectFileLastDirectory is registered for Profile. Here we register it for
62 // testing.
63 prefs.registry()->RegisterStringPref(prefs::kSelectFileLastDirectory,
64 std::string(),
65 PrefRegistrySyncable::UNSYNCABLE_PREF);
60 66
61 StringPrefMember previous; 67 StringPrefMember previous;
62 previous.Init(prefs::kLanguagePreviousInputMethod, &prefs); 68 previous.Init(prefs::kLanguagePreviousInputMethod, &prefs);
63 previous.SetValue("KeyboardA"); 69 previous.SetValue("KeyboardA");
64 StringPrefMember current; 70 StringPrefMember current;
65 current.Init(prefs::kLanguageCurrentInputMethod, &prefs); 71 current.Init(prefs::kLanguageCurrentInputMethod, &prefs);
66 current.SetValue("KeyboardB"); 72 current.SetValue("KeyboardB");
67 73
68 MyMockInputMethodManager mock_manager(&previous, &current); 74 MyMockInputMethodManager mock_manager(&previous, &current);
69 Preferences testee(&mock_manager); 75 Preferences testee(&mock_manager);
70 testee.InitUserPrefsForTesting(&prefs); 76 testee.InitUserPrefsForTesting(&prefs);
71 testee.SetInputMethodListForTesting(); 77 testee.SetInputMethodListForTesting();
72 78
73 // Confirm they're unchanged. 79 // Confirm they're unchanged.
74 EXPECT_EQ("KeyboardA", previous.GetValue()); 80 EXPECT_EQ("KeyboardA", previous.GetValue());
75 EXPECT_EQ("KeyboardB", current.GetValue()); 81 EXPECT_EQ("KeyboardB", current.GetValue());
76 EXPECT_EQ("KeyboardB", mock_manager.last_input_method_id_); 82 EXPECT_EQ("KeyboardB", mock_manager.last_input_method_id_);
77 } 83 }
78 84
79 } // namespace chromeos 85 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698