chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper_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

« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"	5 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

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

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/memory/scoped_ptr.h"	13 #include "base/memory/scoped_ptr.h"

14 #include "base/message_loop/message_loop.h"	14 #include "base/message_loop/message_loop.h"

15 #include "base/prefs/pref_notifier_impl.h"

16 #include "base/prefs/pref_service.h"

17 #include "base/prefs/testing_pref_service.h"

18 #include "base/run_loop.h"	15 #include "base/run_loop.h"

19 #include "base/strings/string16.h"	16 #include "base/strings/string16.h"

20 #include "base/strings/string_util.h"	17 #include "base/strings/string_util.h"

21 #include "base/strings/utf_string_conversions.h"	18 #include "base/strings/utf_string_conversions.h"

22 #include "build/build_config.h"	19 #include "build/build_config.h"

23 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	20 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

24 #include "chrome/browser/history/history_service_factory.h"	21 #include "chrome/browser/history/history_service_factory.h"

25 #include "chrome/browser/prefs/browser_prefs.h"	22 #include "chrome/browser/prefs/browser_prefs.h"

26 #include "chrome/test/base/testing_profile.h"	23 #include "chrome/test/base/testing_profile.h"

27 #include "components/bookmarks/browser/bookmark_model.h"	24 #include "components/bookmarks/browser/bookmark_model.h"

28 #include "components/bookmarks/test/bookmark_test_helpers.h"	25 #include "components/bookmarks/test/bookmark_test_helpers.h"

29 #include "components/history/core/browser/history_service.h"	26 #include "components/history/core/browser/history_service.h"

30 #include "components/pref_registry/pref_registry_syncable.h"	27 #include "components/pref_registry/pref_registry_syncable.h"

	28 #include "components/prefs/pref_notifier_impl.h"

	29 #include "components/prefs/pref_service.h"

	30 #include "components/prefs/testing_pref_service.h"

31 #include "components/syncable_prefs/testing_pref_service_syncable.h"	31 #include "components/syncable_prefs/testing_pref_service_syncable.h"

32 #include "content/public/test/test_browser_thread_bundle.h"	32 #include "content/public/test/test_browser_thread_bundle.h"

33 #include "content/public/test/test_utils.h"	33 #include "content/public/test/test_utils.h"

34 #include "testing/gmock/include/gmock/gmock.h"	34 #include "testing/gmock/include/gmock/gmock.h"

35 #include "testing/gtest/include/gtest/gtest.h"	35 #include "testing/gtest/include/gtest/gtest.h"

36	36

37 #if defined(OS_CHROMEOS)	37 #if defined(OS_CHROMEOS)

38 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"	38 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"

39 #include "chrome/browser/chromeos/settings/cros_settings.h"	39 #include "chrome/browser/chromeos/settings/cros_settings.h"

40 #include "chrome/browser/chromeos/settings/device_settings_service.h"	40 #include "chrome/browser/chromeos/settings/device_settings_service.h"

(...skipping 233 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
274	274

275 TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Restarted) {	275 TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Restarted) {

276 // Browser has been shut down since profile was created.	276 // Browser has been shut down since profile was created.

277 user_prefs_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NONE);	277 user_prefs_->set_read_error(PersistentPrefStore::PREF_READ_ERROR_NONE);

278 EXPECT_TRUE(	278 EXPECT_TRUE(

279 GetCallbackResult(	279 GetCallbackResult(

280 base::Bind(	280 base::Bind(

281 &ui::CheckShouldPromptForNewProfile,	281 &ui::CheckShouldPromptForNewProfile,

282 profile_.get())));	282 profile_.get())));

283 }	283 }

OLD	NEW