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

Side by Side Diff: chrome/browser/sync/sync_setup_wizard_unittest.cc

Issue 7633077: Refactor syncapi.h (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: This patch has compiled from a clean build Created 9 years, 4 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
« no previous file with comments | « chrome/browser/sync/sessions/DEPS ('k') | chrome/browser/sync/syncable/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.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"
13 #include "chrome/browser/sync/profile_sync_factory_mock.h" 12 #include "chrome/browser/sync/profile_sync_factory_mock.h"
14 #include "chrome/browser/sync/profile_sync_service.h" 13 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "chrome/browser/sync/signin_manager.h" 14 #include "chrome/browser/sync/signin_manager.h"
16 #include "chrome/browser/sync/sync_setup_flow.h" 15 #include "chrome/browser/sync/sync_setup_flow.h"
17 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_list.h" 17 #include "chrome/browser/ui/browser_list.h"
19 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" 18 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h"
20 #include "chrome/common/net/gaia/google_service_auth_error.h" 19 #include "chrome/common/net/gaia/google_service_auth_error.h"
21 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
22 #include "chrome/test/base/browser_with_test_window_test.h" 21 #include "chrome/test/base/browser_with_test_window_test.h"
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE)); 580 AuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
582 wizard_->Step(SyncSetupWizard::NONFATAL_ERROR); 581 wizard_->Step(SyncSetupWizard::NONFATAL_ERROR);
583 AttachSyncSetupHandler(); 582 AttachSyncSetupHandler();
584 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_); 583 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, flow_->current_state_);
585 EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_); 584 EXPECT_EQ(SyncSetupWizard::DONE, flow_->end_state_);
586 CloseSetupUI(); 585 CloseSetupUI();
587 EXPECT_FALSE(wizard_->IsVisible()); 586 EXPECT_FALSE(wizard_->IsVisible());
588 } 587 }
589 588
590 #undef SKIP_TEST_ON_MACOSX 589 #undef SKIP_TEST_ON_MACOSX
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/DEPS ('k') | chrome/browser/sync/syncable/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698