OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/integration/sync_test.h" | 5 #include "chrome/browser/sync/test/integration/sync_test.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 void SyncTest::TriggerMigrationDoneError( | 633 void SyncTest::TriggerMigrationDoneError( |
634 syncable::ModelTypeSet model_types) { | 634 syncable::ModelTypeSet model_types) { |
635 ASSERT_TRUE(ServerSupportsErrorTriggering()); | 635 ASSERT_TRUE(ServerSupportsErrorTriggering()); |
636 std::string path = "chromiumsync/migrate"; | 636 std::string path = "chromiumsync/migrate"; |
637 char joiner = '?'; | 637 char joiner = '?'; |
638 for (syncable::ModelTypeSet::Iterator it = model_types.First(); | 638 for (syncable::ModelTypeSet::Iterator it = model_types.First(); |
639 it.Good(); it.Inc()) { | 639 it.Good(); it.Inc()) { |
640 path.append( | 640 path.append( |
641 base::StringPrintf( | 641 base::StringPrintf( |
642 "%ctype=%d", joiner, | 642 "%ctype=%d", joiner, |
643 syncable::GetExtensionFieldNumberFromModelType(it.Get()))); | 643 syncable::GetSpecificsFieldNumberFromModelType(it.Get()))); |
644 joiner = '&'; | 644 joiner = '&'; |
645 } | 645 } |
646 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); | 646 ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); |
647 ASSERT_EQ("Migration: 200", | 647 ASSERT_EQ("Migration: 200", |
648 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle())); | 648 UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle())); |
649 } | 649 } |
650 | 650 |
651 void SyncTest::TriggerBirthdayError() { | 651 void SyncTest::TriggerBirthdayError() { |
652 ASSERT_TRUE(ServerSupportsErrorTriggering()); | 652 ASSERT_TRUE(ServerSupportsErrorTriggering()); |
653 std::string path = "chromiumsync/birthdayerror"; | 653 std::string path = "chromiumsync/birthdayerror"; |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 | 758 |
759 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 759 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
760 const net::ProxyConfig& proxy_config) { | 760 const net::ProxyConfig& proxy_config) { |
761 base::WaitableEvent done(false, false); | 761 base::WaitableEvent done(false, false); |
762 BrowserThread::PostTask( | 762 BrowserThread::PostTask( |
763 BrowserThread::IO, FROM_HERE, | 763 BrowserThread::IO, FROM_HERE, |
764 base::Bind(&SetProxyConfigCallback, &done, | 764 base::Bind(&SetProxyConfigCallback, &done, |
765 make_scoped_refptr(context_getter), proxy_config)); | 765 make_scoped_refptr(context_getter), proxy_config)); |
766 done.Wait(); | 766 done.Wait(); |
767 } | 767 } |
OLD | NEW |