Commit 3b7b590a authored by Eugene But's avatar Eugene But Committed by Commit Bot

Rename ShellEarlGreyAppInterface's loadURL: to startLoadingURL:.

loadURL: from other test helpers wait until load is finished.
startLoadingURL: name emphasizes that method returns without waiting.

Bug: 960407
Change-Id: I50a9f38cb30bece839279a9e46089fca6220af2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1623626
Auto-Submit: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662062}
parent 156cecbc
...@@ -25,7 +25,7 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ShellEarlGreyAppInterface) ...@@ -25,7 +25,7 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ShellEarlGreyAppInterface)
- (void)loadURL:(const GURL&)URL { - (void)loadURL:(const GURL&)URL {
NSString* spec = base::SysUTF8ToNSString(URL.spec()); NSString* spec = base::SysUTF8ToNSString(URL.spec());
[ShellEarlGreyAppInterface loadURL:spec]; [ShellEarlGreyAppInterface startLoadingURL:spec];
NSString* loadingErrorDescription = [NSString NSString* loadingErrorDescription = [NSString
stringWithFormat:@"Current WebState did not finish loading %@ URL", spec]; stringWithFormat:@"Current WebState did not finish loading %@ URL", spec];
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// Loads |URL| in the current WebState with transition of type // Loads |URL| in the current WebState with transition of type
// ui::PAGE_TRANSITION_TYPED and returns without waiting for the page to load. // ui::PAGE_TRANSITION_TYPED and returns without waiting for the page to load.
+ (void)loadURL:(NSString*)spec; + (void)startLoadingURL:(NSString*)spec;
// Returns YES if the current WebState is loading. // Returns YES if the current WebState is loading.
+ (BOOL)isCurrentWebStateLoading WARN_UNUSED_RESULT; + (BOOL)isCurrentWebStateLoading WARN_UNUSED_RESULT;
......
...@@ -22,7 +22,7 @@ using web::shell_test_util::GetCurrentWebState; ...@@ -22,7 +22,7 @@ using web::shell_test_util::GetCurrentWebState;
@implementation ShellEarlGreyAppInterface @implementation ShellEarlGreyAppInterface
+ (void)loadURL:(NSString*)spec { + (void)startLoadingURL:(NSString*)spec {
web::test::LoadUrl(GetCurrentWebState(), GURL(base::SysNSStringToUTF8(spec))); web::test::LoadUrl(GetCurrentWebState(), GURL(base::SysNSStringToUTF8(spec)));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment