chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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

OLD	NEW
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/input_method/input_method_persistence.h"	5 #include "chrome/browser/chromeos/input_method/input_method_persistence.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

	8 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"	9 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"

9 #include "chrome/browser/chromeos/language_preferences.h"	10 #include "chrome/browser/chromeos/language_preferences.h"

10 #include "chrome/browser/prefs/pref_service.h"

11 #include "chrome/browser/profiles/profile_manager.h"	11 #include "chrome/browser/profiles/profile_manager.h"

12 #include "chrome/common/chrome_switches.h"	12 #include "chrome/common/chrome_switches.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "chrome/test/base/testing_browser_process.h"	14 #include "chrome/test/base/testing_browser_process.h"

15 #include "chrome/test/base/testing_pref_service.h"	15 #include "chrome/test/base/testing_pref_service.h"

16 #include "chrome/test/base/testing_profile.h"	16 #include "chrome/test/base/testing_profile.h"

17 #include "chrome/test/base/testing_profile_manager.h"	17 #include "chrome/test/base/testing_profile_manager.h"

18	18

19 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

20	20

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 VerifyPrefs(kInputId2, "", kInputId2);	100 VerifyPrefs(kInputId2, "", kInputId2);

101	101

102 persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);	102 persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);

103 mock_manager_.SetCurrentInputMethodId(kInputId1);	103 mock_manager_.SetCurrentInputMethodId(kInputId1);

104 persistence.InputMethodChanged(&mock_manager_, false);	104 persistence.InputMethodChanged(&mock_manager_, false);

105 VerifyPrefs(kInputId1, kInputId2, kInputId2);	105 VerifyPrefs(kInputId1, kInputId2, kInputId2);

106 }	106 }

107	107

108 } // namespace input_method	108 } // namespace input_method

109 } // namespace chromeos	109 } // namespace chromeos

OLD	NEW