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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_settings_service_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/supervised_user/supervised_user_settings_service.h" 5 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/testing_pref_store.h"
14 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "components/prefs/testing_pref_store.h"
15 #include "content/public/test/test_browser_thread_bundle.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
16 #include "sync/api/fake_sync_change_processor.h" 16 #include "sync/api/fake_sync_change_processor.h"
17 #include "sync/api/sync_change.h" 17 #include "sync/api/sync_change.h"
18 #include "sync/api/sync_change_processor_wrapper_for_test.h" 18 #include "sync/api/sync_change_processor_wrapper_for_test.h"
19 #include "sync/api/sync_error_factory_mock.h" 19 #include "sync/api/sync_error_factory_mock.h"
20 #include "sync/protocol/sync.pb.h" 20 #include "sync/protocol/sync.pb.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 namespace { 23 namespace {
24 24
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // The uploaded items should not show up as settings. 286 // The uploaded items should not show up as settings.
287 const base::Value* value = NULL; 287 const base::Value* value = NULL;
288 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value)); 288 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));
289 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value)); 289 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));
290 290
291 // Restarting sync should not create any new changes. 291 // Restarting sync should not create any new changes.
292 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS); 292 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);
293 StartSyncing(sync_data); 293 StartSyncing(sync_data);
294 ASSERT_EQ(0u, sync_processor_->changes().size()); 294 ASSERT_EQ(0u, sync_processor_->changes().size());
295 } 295 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698