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

Side by Side Diff: chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm

Issue 2521001: AutoFill: Make PersonalDataManager RefCountedThreadSafe. (Closed)
Patch Set: Fix lints. Created 10 years, 6 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 | « no previous file | chrome/browser/autofill/autofill_manager.h » ('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) 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 "base/ref_counted.h"
5 #import "chrome/browser/autofill/autofill_address_model_mac.h" 6 #import "chrome/browser/autofill/autofill_address_model_mac.h"
6 #import "chrome/browser/autofill/autofill_address_view_controller_mac.h" 7 #import "chrome/browser/autofill/autofill_address_view_controller_mac.h"
7 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" 8 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
8 #import "chrome/browser/autofill/autofill_credit_card_view_controller_mac.h" 9 #import "chrome/browser/autofill/autofill_credit_card_view_controller_mac.h"
9 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h" 10 #import "chrome/browser/autofill/autofill_dialog_controller_mac.h"
10 #include "chrome/browser/autofill/autofill_profile.h" 11 #include "chrome/browser/autofill/autofill_profile.h"
11 #include "chrome/browser/autofill/personal_data_manager.h" 12 #include "chrome/browser/autofill/personal_data_manager.h"
12 #include "chrome/browser/cocoa/browser_test_helper.h" 13 #include "chrome/browser/cocoa/browser_test_helper.h"
13 #import "chrome/browser/cocoa/cocoa_test_helper.h" 14 #import "chrome/browser/cocoa/cocoa_test_helper.h"
14 #include "chrome/browser/pref_service.h" 15 #include "chrome/browser/pref_service.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool test_data_is_loaded_; 64 bool test_data_is_loaded_;
64 65
65 private: 66 private:
66 DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock); 67 DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerMock);
67 }; 68 };
68 69
69 // Mock profile that gives back our own mock |PersonalDataManager|. 70 // Mock profile that gives back our own mock |PersonalDataManager|.
70 class ProfileMock : public TestingProfile { 71 class ProfileMock : public TestingProfile {
71 public: 72 public:
72 ProfileMock() { 73 ProfileMock() {
73 test_manager_.reset(new PersonalDataManagerMock); 74 test_manager_ =new PersonalDataManagerMock;
74 } 75 }
75 virtual ~ProfileMock() {} 76 virtual ~ProfileMock() {}
76 77
77 virtual PersonalDataManager* GetPersonalDataManager() { 78 virtual PersonalDataManager* GetPersonalDataManager() {
78 return test_manager_.get(); 79 return test_manager_.get();
79 } 80 }
80 81
81 scoped_ptr<PersonalDataManagerMock> test_manager_; 82 scoped_refptr<PersonalDataManagerMock> test_manager_;
82 83
83 private: 84 private:
84 DISALLOW_COPY_AND_ASSIGN(ProfileMock); 85 DISALLOW_COPY_AND_ASSIGN(ProfileMock);
85 }; 86 };
86 87
87 // Mock browser that gives back our own |BrowserMock| instance as the profile. 88 // Mock browser that gives back our own |BrowserMock| instance as the profile.
88 class BrowserMock : public BrowserTestHelper { 89 class BrowserMock : public BrowserTestHelper {
89 public: 90 public:
90 BrowserMock() { 91 BrowserMock() {
91 test_profile_.reset(new ProfileMock); 92 test_profile_.reset(new ProfileMock);
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 } 239 }
239 240
240 TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) { 241 TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) {
241 AutoFillProfile profile(ASCIIToUTF16("Home"), 17); 242 AutoFillProfile profile(ASCIIToUTF16("Home"), 17);
242 profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("David")); 243 profile.SetInfo(AutoFillType(NAME_FIRST), ASCIIToUTF16("David"));
243 profile.SetInfo(AutoFillType(NAME_MIDDLE), ASCIIToUTF16("C")); 244 profile.SetInfo(AutoFillType(NAME_MIDDLE), ASCIIToUTF16("C"));
244 profile.SetInfo(AutoFillType(NAME_LAST), ASCIIToUTF16("Holloway")); 245 profile.SetInfo(AutoFillType(NAME_LAST), ASCIIToUTF16("Holloway"));
245 profile.SetInfo(AutoFillType(EMAIL_ADDRESS), 246 profile.SetInfo(AutoFillType(EMAIL_ADDRESS),
246 ASCIIToUTF16("dhollowa@chromium.org")); 247 ASCIIToUTF16("dhollowa@chromium.org"));
247 profile.SetInfo(AutoFillType(COMPANY_NAME), ASCIIToUTF16("Google Inc.")); 248 profile.SetInfo(AutoFillType(COMPANY_NAME), ASCIIToUTF16("Google Inc."));
248 profile.SetInfo( 249 profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE1),
249 AutoFillType(ADDRESS_HOME_LINE1), ASCIIToUTF16("1122 Mountain View Road")) ; 250 ASCIIToUTF16("1122 Mountain View Road"));
250 profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2), ASCIIToUTF16("Suite #1")); 251 profile.SetInfo(AutoFillType(ADDRESS_HOME_LINE2), ASCIIToUTF16("Suite #1"));
251 profile.SetInfo(AutoFillType(ADDRESS_HOME_CITY), 252 profile.SetInfo(AutoFillType(ADDRESS_HOME_CITY),
252 ASCIIToUTF16("Mountain View")); 253 ASCIIToUTF16("Mountain View"));
253 profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA")); 254 profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA"));
254 profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("94111")); 255 profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("94111"));
255 profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("USA")); 256 profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("USA"));
256 profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER), ASCIIToUTF16("014155552 258")); 257 profile.SetInfo(
257 profile.SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER), ASCIIToUTF16("0240871722 58")); 258 AutoFillType(PHONE_HOME_WHOLE_NUMBER), ASCIIToUTF16("014155552258"));
259 profile.SetInfo(
260 AutoFillType(PHONE_FAX_WHOLE_NUMBER), ASCIIToUTF16("024087172258"));
258 profiles().push_back(&profile); 261 profiles().push_back(&profile);
259 262
260 LoadDialog(); 263 LoadDialog();
261 264
262 AutoFillAddressModel* am = [[[controller_ addressFormViewControllers] 265 AutoFillAddressModel* am = [[[controller_ addressFormViewControllers]
263 objectAtIndex:0] addressModel]; 266 objectAtIndex:0] addressModel];
264 EXPECT_TRUE([[am label] isEqualToString:@"Home"]); 267 EXPECT_TRUE([[am label] isEqualToString:@"Home"]);
265 EXPECT_TRUE([[am firstName] isEqualToString:@"David"]); 268 EXPECT_TRUE([[am firstName] isEqualToString:@"David"]);
266 EXPECT_TRUE([[am middleName] isEqualToString:@"C"]); 269 EXPECT_TRUE([[am middleName] isEqualToString:@"C"]);
267 EXPECT_TRUE([[am lastName] isEqualToString:@"Holloway"]); 270 EXPECT_TRUE([[am lastName] isEqualToString:@"Holloway"]);
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 // Sizes should match. 584 // Sizes should match.
582 ASSERT_EQ(1UL, observer_.profiles_.size()); 585 ASSERT_EQ(1UL, observer_.profiles_.size());
583 ASSERT_EQ(1UL, observer_.credit_cards_.size()); 586 ASSERT_EQ(1UL, observer_.credit_cards_.size());
584 587
585 // Contents should match. 588 // Contents should match.
586 ASSERT_EQ(observer_.profiles_[0], profile); 589 ASSERT_EQ(observer_.profiles_[0], profile);
587 ASSERT_EQ(observer_.credit_cards_[0], credit_card); 590 ASSERT_EQ(observer_.credit_cards_[0], credit_card);
588 } 591 }
589 592
590 } // namespace 593 } // namespace
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autofill/autofill_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698