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

Side by Side Diff: chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc

Issue 436373002: Move non-API code out of sync/api/attachments/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Apply CR feedback. Created 6 years, 4 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/json/json_string_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/prefs/synced_pref_change_registrar.h" 11 #include "chrome/browser/prefs/synced_pref_change_registrar.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/test/base/in_process_browser_test.h" 14 #include "chrome/test/base/in_process_browser_test.h"
15 #include "chrome/test/base/testing_pref_service_syncable.h" 15 #include "chrome/test/base/testing_pref_service_syncable.h"
16 #include "chrome/test/base/testing_profile.h" 16 #include "chrome/test/base/testing_profile.h"
17 #include "content/public/test/test_utils.h" 17 #include "content/public/test/test_utils.h"
18 #include "sync/api/attachments/attachment_id.h" 18 #include "sync/api/attachments/attachment_id.h"
19 #include "sync/api/attachments/attachment_service_proxy_for_test.h"
20 #include "sync/api/fake_sync_change_processor.h" 19 #include "sync/api/fake_sync_change_processor.h"
21 #include "sync/api/sync_change.h" 20 #include "sync/api/sync_change.h"
22 #include "sync/api/sync_error_factory.h" 21 #include "sync/api/sync_error_factory.h"
23 #include "sync/api/sync_error_factory_mock.h" 22 #include "sync/api/sync_error_factory_mock.h"
24 #include "sync/api/syncable_service.h" 23 #include "sync/api/syncable_service.h"
24 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
25 #include "sync/protocol/sync.pb.h" 25 #include "sync/protocol/sync.pb.h"
26 26
27 #if defined(ENABLE_CONFIGURATION_POLICY) 27 #if defined(ENABLE_CONFIGURATION_POLICY)
28 #include "components/policy/core/browser/browser_policy_connector.h" 28 #include "components/policy/core/browser/browser_policy_connector.h"
29 #include "components/policy/core/common/mock_configuration_policy_provider.h" 29 #include "components/policy/core/common/mock_configuration_policy_provider.h"
30 #include "components/policy/core/common/policy_map.h" 30 #include "components/policy/core/common/policy_map.h"
31 #include "policy/policy_constants.h" 31 #include "policy/policy_constants.h"
32 #endif 32 #endif
33 33
34 namespace { 34 namespace {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 new base::FundamentalValue(true), 216 new base::FundamentalValue(true),
217 NULL); 217 NULL);
218 UpdateChromePolicy(policies); 218 UpdateChromePolicy(policies);
219 219
220 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton)); 220 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton));
221 SetBooleanPrefValueFromSync(prefs::kShowHomeButton, false); 221 SetBooleanPrefValueFromSync(prefs::kShowHomeButton, false);
222 EXPECT_FALSE(observer.has_been_notified); 222 EXPECT_FALSE(observer.has_been_notified);
223 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton)); 223 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton));
224 } 224 }
225 #endif 225 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698