chrome/browser/sync/sync_setup_wizard_unittest.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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/sync/sync_setup_wizard_unittest.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 3 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/sync/sync_setup_wizard.cc ('k') | chrome/browser/tab_contents/navigation_controller.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/sync/sync_setup_wizard.h"	5 #include "chrome/browser/sync/sync_setup_wizard.h"

6	6

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

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

9 #include "base/stl_util-inl.h"	9 #include "base/stl_util-inl.h"

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

11 #include "chrome/browser/browser.h"	11 #include "chrome/browser/browser.h"

12 #include "chrome/browser/browser_list.h"	12 #include "chrome/browser/browser_list.h"

13 #include "chrome/browser/pref_service.h"	13 #include "chrome/browser/prefs/pref_service.h"

14 #include "chrome/browser/sync/profile_sync_factory_mock.h"	14 #include "chrome/browser/sync/profile_sync_factory_mock.h"

15 #include "chrome/browser/sync/profile_sync_service.h"	15 #include "chrome/browser/sync/profile_sync_service.h"

16 #include "chrome/browser/sync/sync_setup_flow.h"	16 #include "chrome/browser/sync/sync_setup_flow.h"

17 #include "chrome/common/net/gaia/google_service_auth_error.h"	17 #include "chrome/common/net/gaia/google_service_auth_error.h"

18 #include "chrome/common/pref_names.h"	18 #include "chrome/common/pref_names.h"

19 #include "chrome/test/browser_with_test_window_test.h"	19 #include "chrome/test/browser_with_test_window_test.h"

20 #include "chrome/test/testing_profile.h"	20 #include "chrome/test/testing_profile.h"

21 #include "chrome/test/test_browser_window.h"	21 #include "chrome/test/test_browser_window.h"

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

23	23

(...skipping 459 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
483 int error = -1;	483 int error = -1;

484 dialog_args.GetInteger("error", &error);	484 dialog_args.GetInteger("error", &error);

485 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);	485 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);

486 service_->set_auth_state(kTestUser, AuthError::None());	486 service_->set_auth_state(kTestUser, AuthError::None());

487	487

488 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);	488 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);

489 EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());	489 EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());

490 }	490 }

491	491

492 #undef SKIP_TEST_ON_MACOSX	492 #undef SKIP_TEST_ON_MACOSX

OLD	NEW