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

Side by Side Diff: chrome/browser/autofill/android/personal_data_manager_android.cc

Issue 2296943002: Fix Java PersonalDataManagerTest flake. (Closed)
Patch Set: Wait for init event only if not initialized yet. Created 4 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/autofill/android/personal_data_manager_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/autofill/android/personal_data_manager_android.h" 5 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 : weak_java_obj_(env, obj), 310 : weak_java_obj_(env, obj),
311 personal_data_manager_(PersonalDataManagerFactory::GetForProfile( 311 personal_data_manager_(PersonalDataManagerFactory::GetForProfile(
312 ProfileManager::GetActiveUserProfile())) { 312 ProfileManager::GetActiveUserProfile())) {
313 personal_data_manager_->AddObserver(this); 313 personal_data_manager_->AddObserver(this);
314 } 314 }
315 315
316 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() { 316 PersonalDataManagerAndroid::~PersonalDataManagerAndroid() {
317 personal_data_manager_->RemoveObserver(this); 317 personal_data_manager_->RemoveObserver(this);
318 } 318 }
319 319
320 jboolean PersonalDataManagerAndroid::IsDataLoaded(
321 JNIEnv* env,
322 const base::android::JavaParamRef<jobject>& unused_obj) const {
323 return personal_data_manager_->IsDataLoaded();
324 }
325
320 ScopedJavaLocalRef<jobjectArray> 326 ScopedJavaLocalRef<jobjectArray>
321 PersonalDataManagerAndroid::GetProfileGUIDsForSettings( 327 PersonalDataManagerAndroid::GetProfileGUIDsForSettings(
322 JNIEnv* env, 328 JNIEnv* env,
323 const JavaParamRef<jobject>& unused_obj) { 329 const JavaParamRef<jobject>& unused_obj) {
324 return GetProfileGUIDs(env, personal_data_manager_->GetProfiles()); 330 return GetProfileGUIDs(env, personal_data_manager_->GetProfiles());
325 } 331 }
326 332
327 ScopedJavaLocalRef<jobjectArray> 333 ScopedJavaLocalRef<jobjectArray>
328 PersonalDataManagerAndroid::GetProfileGUIDsToSuggest( 334 PersonalDataManagerAndroid::GetProfileGUIDsToSuggest(
329 JNIEnv* env, 335 JNIEnv* env,
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 base::android::ConvertJavaStringToUTF16(env, jcountry_name))); 738 base::android::ConvertJavaStringToUTF16(env, jcountry_name)));
733 } 739 }
734 740
735 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 741 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
736 PersonalDataManagerAndroid* personal_data_manager_android = 742 PersonalDataManagerAndroid* personal_data_manager_android =
737 new PersonalDataManagerAndroid(env, obj); 743 new PersonalDataManagerAndroid(env, obj);
738 return reinterpret_cast<intptr_t>(personal_data_manager_android); 744 return reinterpret_cast<intptr_t>(personal_data_manager_android);
739 } 745 }
740 746
741 } // namespace autofill 747 } // namespace autofill
OLDNEW
« no previous file with comments | « chrome/browser/autofill/android/personal_data_manager_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698