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

Side by Side Diff: chrome/browser/extensions/api/system_private/system_private_apitest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/prefs/pref_service.h"
7 #include "build/build_config.h" 6 #include "build/build_config.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
11 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "components/prefs/pref_service.h"
12 12
13 #if defined(OS_CHROMEOS) 13 #if defined(OS_CHROMEOS)
14 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/dbus/fake_update_engine_client.h" 15 #include "chromeos/dbus/fake_update_engine_client.h"
16 16
17 using chromeos::UpdateEngineClient; 17 using chromeos::UpdateEngineClient;
18 #endif 18 #endif
19 19
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) { 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetIncognitoModeAvailability) {
21 PrefService* pref_service = browser()->profile()->GetPrefs(); 21 PrefService* pref_service = browser()->profile()->GetPrefs();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // The fake client returns the last status in this order. 62 // The fake client returns the last status in this order.
63 fake_update_engine_client_->PushLastStatus(status_not_available); 63 fake_update_engine_client_->PushLastStatus(status_not_available);
64 fake_update_engine_client_->PushLastStatus(status_updating); 64 fake_update_engine_client_->PushLastStatus(status_updating);
65 fake_update_engine_client_->PushLastStatus(status_boot_needed); 65 fake_update_engine_client_->PushLastStatus(status_boot_needed);
66 66
67 ASSERT_TRUE(RunComponentExtensionTest( 67 ASSERT_TRUE(RunComponentExtensionTest(
68 "system/get_update_status")) << message_; 68 "system/get_update_status")) << message_;
69 } 69 }
70 70
71 #endif 71 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/system_private/system_private_api.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698