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

Side by Side Diff: chrome/browser/chromeos/accessibility/magnification_manager_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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/accessibility/magnification_manager.h" 5 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
6 6
7 #include "ash/magnifier/magnifier_constants.h" 7 #include "ash/magnifier/magnifier_constants.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/common/chrome_notification_types.h" 12 #include "chrome/common/chrome_notification_types.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/notification_service.h" 14 #include "content/public/browser/notification_service.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 namespace { 18 namespace {
19 19
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 SetMagnifierType(ash::MAGNIFIER_PARTIAL); 158 SetMagnifierType(ash::MAGNIFIER_PARTIAL);
159 EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_PARTIAL); 159 EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_PARTIAL);
160 160
161 // Disables magnifier, and confirm the status is set successfully. 161 // Disables magnifier, and confirm the status is set successfully.
162 DisableMagnifier(); 162 DisableMagnifier();
163 EXPECT_FALSE(IsMagnifierEnabled()); 163 EXPECT_FALSE(IsMagnifierEnabled());
164 EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_PARTIAL); 164 EXPECT_EQ(GetMagnifierType(), ash::MAGNIFIER_PARTIAL);
165 } 165 }
166 166
167 } // namespace chromeos 167 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698