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

Side by Side Diff: chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc

Issue 2137463003: [Extensions] Move Feature channel code into //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 4 years, 5 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/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/prefs/session_startup_pref.h" 10 #include "chrome/browser/prefs/session_startup_pref.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "chrome/common/extensions/features/feature_channel.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
15 #include "components/prefs/pref_service.h" 14 #include "components/prefs/pref_service.h"
16 #include "components/search_engines/template_url.h" 15 #include "components/search_engines/template_url.h"
17 #include "components/search_engines/template_url_service.h" 16 #include "components/search_engines/template_url_service.h"
18 #include "components/version_info/version_info.h" 17 #include "components/version_info/version_info.h"
18 #include "extensions/common/features/feature_channel.h"
19 19
20 namespace { 20 namespace {
21 21
22 class TemplateURLServiceObserver { 22 class TemplateURLServiceObserver {
23 public: 23 public:
24 TemplateURLServiceObserver(TemplateURLService* service, 24 TemplateURLServiceObserver(TemplateURLService* service,
25 base::RunLoop* loop) 25 base::RunLoop* loop)
26 : runner_(loop) { 26 : runner_(loop) {
27 DCHECK(loop); 27 DCHECK(loop);
28 template_url_sub_ = service->RegisterOnLoadedCallback( 28 template_url_sub_ = service->RegisterOnLoadedCallback(
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ASSERT_TRUE(extension); 134 ASSERT_TRUE(extension);
135 ASSERT_EQ(1u, extension->install_warnings().size()); 135 ASSERT_EQ(1u, extension->install_warnings().size());
136 EXPECT_EQ(std::string( 136 EXPECT_EQ(std::string(
137 "'chrome_settings_overrides' " 137 "'chrome_settings_overrides' "
138 "is not allowed for specified platform."), 138 "is not allowed for specified platform."),
139 extension->install_warnings().front().message); 139 extension->install_warnings().front().message);
140 #endif 140 #endif
141 } 141 }
142 142
143 } // namespace 143 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698