OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/macros.h" | 6 #include "base/macros.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/prefs/pref_service.h" | |
9 #include "base/values.h" | 8 #include "base/values.h" |
10 #include "build/build_config.h" | 9 #include "build/build_config.h" |
11 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te.h" | 10 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te.h" |
12 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te_factory.h" | 11 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te_factory.h" |
13 #include "chrome/browser/extensions/extension_apitest.h" | 12 #include "chrome/browser/extensions/extension_apitest.h" |
14 #include "chrome/common/extensions/api/settings_private.h" | 13 #include "chrome/common/extensions/api/settings_private.h" |
15 #include "components/keyed_service/core/keyed_service.h" | 14 #include "components/keyed_service/core/keyed_service.h" |
| 15 #include "components/prefs/pref_service.h" |
16 #include "content/public/test/test_utils.h" | 16 #include "content/public/test/test_utils.h" |
17 #include "extensions/common/switches.h" | 17 #include "extensions/common/switches.h" |
18 | 18 |
19 #if defined(OS_CHROMEOS) | 19 #if defined(OS_CHROMEOS) |
20 #include "chromeos/chromeos_switches.h" | 20 #include "chromeos/chromeos_switches.h" |
21 #endif | 21 #endif |
22 | 22 |
23 namespace extensions { | 23 namespace extensions { |
24 | 24 |
25 namespace { | 25 namespace { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, SetPref_CrOSSetting) { | 74 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, SetPref_CrOSSetting) { |
75 EXPECT_TRUE(RunSettingsSubtest("setPref_CrOSSetting")) << message_; | 75 EXPECT_TRUE(RunSettingsSubtest("setPref_CrOSSetting")) << message_; |
76 } | 76 } |
77 | 77 |
78 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, OnPrefsChanged_CrOSSetting) { | 78 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, OnPrefsChanged_CrOSSetting) { |
79 EXPECT_TRUE(RunSettingsSubtest("onPrefsChanged_CrOSSetting")) << message_; | 79 EXPECT_TRUE(RunSettingsSubtest("onPrefsChanged_CrOSSetting")) << message_; |
80 } | 80 } |
81 #endif | 81 #endif |
82 | 82 |
83 } // namespace extensions | 83 } // namespace extensions |
OLD | NEW |