chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 12 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_settings_service.cc ('k') | chrome/browser/supervised_user/supervised_user_site_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/bind.h"	5 #include "base/bind.h"

6 #include "base/callback.h"	6 #include "base/callback.h"

7 #include "base/json/json_reader.h"	7 #include "base/json/json_reader.h"

	8 #include "base/macros.h"

8 #include "base/prefs/testing_pref_store.h"	9 #include "base/prefs/testing_pref_store.h"

9 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

10 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"	11 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"

11 #include "content/public/test/test_browser_thread_bundle.h"	12 #include "content/public/test/test_browser_thread_bundle.h"

12 #include "sync/api/fake_sync_change_processor.h"	13 #include "sync/api/fake_sync_change_processor.h"

13 #include "sync/api/sync_change.h"	14 #include "sync/api/sync_change.h"

14 #include "sync/api/sync_change_processor_wrapper_for_test.h"	15 #include "sync/api/sync_change_processor_wrapper_for_test.h"

15 #include "sync/api/sync_error_factory_mock.h"	16 #include "sync/api/sync_error_factory_mock.h"

16 #include "sync/protocol/sync.pb.h"	17 #include "sync/protocol/sync.pb.h"

17 #include "testing/gtest/include/gtest/gtest.h"	18 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 266 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
284 // The uploaded items should not show up as settings.	285 // The uploaded items should not show up as settings.

285 const base::Value* value = NULL;	286 const base::Value* value = NULL;

286 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));	287 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));

287 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));	288 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));

288	289

289 // Restarting sync should not create any new changes.	290 // Restarting sync should not create any new changes.

290 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);	291 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);

291 StartSyncing(sync_data);	292 StartSyncing(sync_data);

292 ASSERT_EQ(0u, sync_processor_->changes().size());	293 ASSERT_EQ(0u, sync_processor_->changes().size());

293 }	294 }

OLD	NEW