chrome/browser/extensions/system/system_apitest.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/extensions/system/system_apitest.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

« no previous file with comments | « chrome/browser/extensions/system/system_api.cc ('k') | chrome/browser/extensions/test_extension_prefs.cc » ('j') | no next file with comments »

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 "base/prefs/pref_service.h"

5 #include "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

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

7 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

8 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.h"

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

10	10

11 #if defined(OS_CHROMEOS)	11 #if defined(OS_CHROMEOS)

12 #include "chromeos/dbus/mock_dbus_thread_manager.h"	12 #include "chromeos/dbus/mock_dbus_thread_manager.h"

13 #include "chromeos/dbus/mock_update_engine_client.h"	13 #include "chromeos/dbus/mock_update_engine_client.h"

14	14

15 using chromeos::UpdateEngineClient;	15 using chromeos::UpdateEngineClient;

16 using ::testing::Return;	16 using ::testing::Return;

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63	63

64 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())	64 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())

65 .WillOnce(Return(status_not_available))	65 .WillOnce(Return(status_not_available))

66 .WillOnce(Return(status_updating))	66 .WillOnce(Return(status_updating))

67 .WillOnce(Return(status_boot_needed));	67 .WillOnce(Return(status_boot_needed));

68 ASSERT_TRUE(RunComponentExtensionTest(	68 ASSERT_TRUE(RunComponentExtensionTest(

69 "system/get_update_status")) << message_;	69 "system/get_update_status")) << message_;

70 }	70 }

71	71

72 #endif	72 #endif

OLD	NEW