| 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/memory/scoped_ptr.h" |
| 6 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 7 #include "base/values.h" | 8 #include "base/values.h" |
| 8 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te.h" | 9 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te.h" |
| 9 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te_factory.h" | 10 #include "chrome/browser/extensions/api/settings_private/settings_private_delega
te_factory.h" |
| 10 #include "chrome/browser/extensions/extension_apitest.h" | 11 #include "chrome/browser/extensions/extension_apitest.h" |
| 11 #include "chrome/common/extensions/api/settings_private.h" | 12 #include "chrome/common/extensions/api/settings_private.h" |
| 12 #include "components/keyed_service/core/keyed_service.h" | 13 #include "components/keyed_service/core/keyed_service.h" |
| 13 #include "content/public/test/test_utils.h" | 14 #include "content/public/test/test_utils.h" |
| 14 #include "extensions/common/switches.h" | 15 #include "extensions/common/switches.h" |
| 15 | 16 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, SetPref_CrOSSetting) { | 72 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, SetPref_CrOSSetting) { |
| 72 EXPECT_TRUE(RunSettingsSubtest("setPref_CrOSSetting")) << message_; | 73 EXPECT_TRUE(RunSettingsSubtest("setPref_CrOSSetting")) << message_; |
| 73 } | 74 } |
| 74 | 75 |
| 75 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, OnPrefsChanged_CrOSSetting) { | 76 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, OnPrefsChanged_CrOSSetting) { |
| 76 EXPECT_TRUE(RunSettingsSubtest("onPrefsChanged_CrOSSetting")) << message_; | 77 EXPECT_TRUE(RunSettingsSubtest("onPrefsChanged_CrOSSetting")) << message_; |
| 77 } | 78 } |
| 78 #endif | 79 #endif |
| 79 | 80 |
| 80 } // namespace extensions | 81 } // namespace extensions |
| OLD | NEW |