chrome/browser/sync/sync_setup_wizard_unittest.cc - Issue 7342047: Cleanup base/stl_util

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 7342047: Cleanup base/stl_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed unneeded include + rebase Created 9 years, 5 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

« base/stl_util.h ('K') | « chrome/browser/sync/sessions/status_controller.h ('k') | chrome/browser/sync/syncable/directory_backing_store.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

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

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

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

12 #include "chrome/browser/sync/engine/syncapi.h"	12 #include "chrome/browser/sync/engine/syncapi.h"

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

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

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

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_list.h"	17 #include "chrome/browser/ui/browser_list.h"

18 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"	18 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"

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

(...skipping 528 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
548 AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));	548 AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));

549 wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);	549 wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);

550 AttachSyncSetupHandler();	550 AttachSyncSetupHandler();

551 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);	551 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);

552 EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);	552 EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);

553 CloseSetupUI();	553 CloseSetupUI();

554 EXPECT_FALSE(wizard_->IsVisible());	554 EXPECT_FALSE(wizard_->IsVisible());

555 }	555 }

556	556

557 #undef SKIP_TEST_ON_MACOSX	557 #undef SKIP_TEST_ON_MACOSX

OLD	NEW