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

Side by Side Diff: chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/prefs/pref_service.h"
7 #include "base/run_loop.h" 6 #include "base/run_loop.h"
8 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h" 8 #include "build/build_config.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
11 #include "chrome/browser/prefs/session_startup_pref.h" 10 #include "chrome/browser/prefs/session_startup_pref.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/prefs/pref_service.h"
15 #include "components/search_engines/template_url.h" 15 #include "components/search_engines/template_url.h"
16 #include "components/search_engines/template_url_service.h" 16 #include "components/search_engines/template_url_service.h"
17 17
18 namespace { 18 namespace {
19 19
20 class TemplateURLServiceObserver { 20 class TemplateURLServiceObserver {
21 public: 21 public:
22 TemplateURLServiceObserver(TemplateURLService* service, 22 TemplateURLServiceObserver(TemplateURLService* service,
23 base::RunLoop* loop) 23 base::RunLoop* loop)
24 : runner_(loop) { 24 : runner_(loop) {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 ASSERT_TRUE(extension); 126 ASSERT_TRUE(extension);
127 ASSERT_EQ(1u, extension->install_warnings().size()); 127 ASSERT_EQ(1u, extension->install_warnings().size());
128 EXPECT_EQ(std::string( 128 EXPECT_EQ(std::string(
129 "'chrome_settings_overrides' " 129 "'chrome_settings_overrides' "
130 "is not allowed for specified platform."), 130 "is not allowed for specified platform."),
131 extension->install_warnings().front().message); 131 extension->install_warnings().front().message);
132 #endif 132 #endif
133 } 133 }
134 134
135 } // namespace 135 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/sessions/sessions_api.cc ('k') | chrome/browser/extensions/api/settings_private/prefs_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698