EarlGrey tests for Payment Request (base CL)

ios/chrome/browser/payments/payment_request_manager.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/payments/payment_request_manager.h"
 
 #include "base/ios/ios_util.h"
 #import "base/ios/weak_nsobject.h"
 #import "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/values.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#include "ios/chrome/browser/experimental_flags.h"
 #import "ios/chrome/browser/payments/js_payment_request_manager.h"
 #import "ios/chrome/browser/payments/payment_request_coordinator.h"
 #import "ios/chrome/browser/payments/payment_request_web_state_observer.h"
 #include "ios/web/public/favicon_status.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/navigation_manager.h"
 #include "ios/web/public/payments/payment_request.h"
 #include "ios/web/public/ssl_status.h"
 #import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/crw_web_view_proxy.h"
@@ skipping 88 matching lines @@
 
 - (void)setWebState:(web::WebState*)webState {
   [self disconnectWebState];
   if (webState) {
     _paymentRequestJsManager.reset(
         base::mac::ObjCCastStrict<JSPaymentRequestManager>(
             [webState->GetJSInjectionReceiver()
                 instanceOfClass:[JSPaymentRequestManager class]]));
     _webState = webState;
     _webStateObserver->ObserveWebState(webState);
-    [self enableCurrentWebState];

[marq (ping after 24h), 2017/01/11 15:09:57]

Removing this call means that the payment request JS won't be injected into
|webState| until the next time it calls the -webPageLoadedWithStatus: observer
method. 

[Moe, 2017/01/11 16:45:19]

does the JS really need to be injected when switching tabs or inserting a new
one, before a webpage is actually loaded? pageLoadedWithStatus: observer method
seems to work reliably with different reload/navigation scenarios.

   } else {
     _webState = nullptr;
   }
 }
 
 - (void)enablePaymentRequest:(BOOL)enabled {
   // Asynchronously enables PaymentRequest, so that some preferences
   // (UIAccessibilityIsVoiceOverRunning(), for example) have time to synchronize
   // with their own notifications.
   base::WeakNSObject<PaymentRequestManager> weakSelf(self);
   dispatch_async(dispatch_get_main_queue(), ^{
     [weakSelf doEnablePaymentRequest:enabled];
   });
 }
 
 - (void)doEnablePaymentRequest:(BOOL)enabled {
   BOOL changing = _enabled != enabled;
   if (changing) {
     if (!enabled) {
       [self dismissUI];
     }
     _enabled = enabled;
-    [self enableCurrentWebState];

[marq (ping after 24h), 2017/01/11 15:09:57]

Removing this call means that if -enablePaymentRequest: is called, changing the
current value of _enabled, the change won't be reflected in a currently-loaded
web page.

[Moe, 2017/01/11 16:45:19]

enablePaymentRequest: gets called in BrowserViewController's setActive:
What are the scenario's where bvc is toggled between active and inactive?

   }
 }
 
 - (void)cancelRequest {
   [self dismissUI];
   [_paymentRequestJsManager rejectRequestPromise:@"Request cancelled by user."
                                completionHandler:nil];
 }
 
 - (void)close {
   if (_closed)
     return;
 
   _closed = YES;
   [self disableCurrentWebState];
   [self setWebState:nil];
   [self dismissUI];
 }
 
 - (void)enableCurrentWebState {
-  if (![self webState]) {
+  if (![self webState] || !experimental_flags::IsPaymentRequestEnabled()) {

[marq (ping after 24h), 2017/01/11 15:09:57]

I would prefer that the experimental flag gates creating an instance of this
class (at all) rather than just stopping the JS injection.

[Moe, 2017/01/11 16:45:19]

I Agree. But I found no way of adding a command line switch to enable this
feature in the EG test before an instance of the BrowserViewController is
created.

     return;
   }
 
   if (_enabled && [self webStateContentIsSecureHTML]) {
     if (!_webStateEnabled) {
       base::WeakNSObject<PaymentRequestManager> weakSelf(self);
       auto callback =
           base::BindBlock(^bool(const base::DictionaryValue& JSON,
                                 const GURL& originURL, bool userIsInteracting) {
             base::scoped_nsobject<PaymentRequestManager> strongSelf(
@@ skipping 148 matching lines @@
 - (void)pageLoadedWithStatus:(web::PageLoadCompletionStatus)loadStatus {
   if (loadStatus != web::PageLoadCompletionStatus::SUCCESS)
     return;
 
   [self dismissUI];
   _isScriptInjected = NO;
   [self enableCurrentWebState];
 }
 
 @end