[ios clean] Adds Progress Bar to Toolbar.

ios/clean/chrome/browser/ui/toolbar/toolbar_mediator_unittest.mm

 // Copyright 2017 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/clean/chrome/browser/ui/toolbar/toolbar_mediator.h"
 
 #include "base/memory/ptr_util.h"
 #import "ios/clean/chrome/browser/ui/toolbar/toolbar_consumer.h"
+#import "ios/shared/chrome/browser/ui/toolbar/toolbar_test_util.h"
 #import "ios/web/public/test/fakes/test_navigation_manager.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @interface TestToolbarMediator : ToolbarMediator<CRWWebStateObserver>
 @end
 
 @implementation TestToolbarMediator
 @end
 
 namespace {
 
 static const char kTestUrl[] = "http://www.chromium.org";
 
-class ToolbarTestNavigationManager : public web::TestNavigationManager {
- public:
-  ToolbarTestNavigationManager()
-      : can_go_back_(false), can_go_forward_(false) {}
-
-  bool CanGoBack() const override { return can_go_back_; }
-  bool CanGoForward() const override { return can_go_forward_; }
-
-  void set_can_go_back(bool can_go_back) { can_go_back_ = can_go_back; }
-  void set_can_go_forward(bool can_go_forward) {
-    can_go_forward_ = can_go_forward;
-  }
-
- private:
-  bool can_go_back_;
-  bool can_go_forward_;
-};
-
 class ToolbarMediatorTest : public PlatformTest {
  public:
   ToolbarMediatorTest() {
     std::unique_ptr<ToolbarTestNavigationManager> navigation_manager =
         base::MakeUnique<ToolbarTestNavigationManager>();
     navigation_manager_ = navigation_manager.get();
     test_web_state_.SetNavigationManager(std::move(navigation_manager));
     test_web_state_.SetLoading(true);
     mediator_ = [[TestToolbarMediator alloc] init];
     consumer_ = OCMProtocolMock(@protocol(ToolbarConsumer));
   }
 
  protected:
   TestToolbarMediator* mediator_;
-  web::TestWebState test_web_state_;
+  ToolbarTestWebState test_web_state_;
   ToolbarTestNavigationManager* navigation_manager_;
   id consumer_;
 };
 
 // Test no setup is being done on the Toolbar if there's no Webstate.
 TEST_F(ToolbarMediatorTest, TestToolbarSetupWithNoWebstate) {
   mediator_.consumer = consumer_;
 
   [[consumer_ reject] setCanGoForward:NO];
   [[consumer_ reject] setCanGoBack:NO];
-  [[consumer_ reject] setCurrentPageText:[OCMArg any]];
   [[consumer_ reject] setIsLoading:YES];
 }
 
 // Test no setup is being done on the Toolbar if there's no consumer.
 TEST_F(ToolbarMediatorTest, TestToolbarSetupWithNoConsumer) {
   mediator_.webState = &test_web_state_;
 
   [[consumer_ reject] setCanGoForward:NO];
   [[consumer_ reject] setCanGoBack:NO];
-  [[consumer_ reject] setCurrentPageText:[OCMArg any]];
   [[consumer_ reject] setIsLoading:YES];
 }
 
 // Test the Toolbar Setup gets called when the mediator's WebState and Consumer
 // have been set.
 TEST_F(ToolbarMediatorTest, TestToolbarSetup) {
   mediator_.webState = &test_web_state_;
   mediator_.consumer = consumer_;
 
   [[consumer_ verify] setCanGoForward:NO];
   [[consumer_ verify] setCanGoBack:NO];
-  [[consumer_ verify] setCurrentPageText:[OCMArg any]];
   [[consumer_ verify] setIsLoading:YES];
 }
 
 // Test the Toolbar Setup gets called when the mediator's WebState and Consumer
 // have been set in reverse order.
 TEST_F(ToolbarMediatorTest, TestToolbarSetupReverse) {
   mediator_.consumer = consumer_;
   mediator_.webState = &test_web_state_;
 
   [[consumer_ verify] setCanGoForward:NO];
   [[consumer_ verify] setCanGoBack:NO];
-  [[consumer_ verify] setCurrentPageText:[OCMArg any]];
   [[consumer_ verify] setIsLoading:YES];
 }
 
 // Test the Toolbar is updated when the Webstate observer method DidStartLoading
 // is triggered by SetLoading.
 TEST_F(ToolbarMediatorTest, TestDidStartLoading) {
   // Change the default loading state to false so we can verify the Webstate
   // callback with true.
   test_web_state_.SetLoading(false);
   mediator_.webState = &test_web_state_;
@@ skipping 20 matching lines @@
   mediator_.consumer = consumer_;
 
   navigation_manager_->set_can_go_forward(true);
   navigation_manager_->set_can_go_back(true);
 
   test_web_state_.SetCurrentURL(GURL(kTestUrl));
   test_web_state_.OnPageLoaded(web::PageLoadCompletionStatus::SUCCESS);
 
   [[consumer_ verify] setCanGoForward:YES];
   [[consumer_ verify] setCanGoBack:YES];
-  [[consumer_ verify] setCurrentPageText:@"http://www.chromium.org/"];
+}
+
+// Test the Toolbar is updated when the Webstate observer method
+// didChangeLoadingProgress is called.
+TEST_F(ToolbarMediatorTest, TestLoadingProgress) {
+  mediator_.webState = &test_web_state_;
+  mediator_.consumer = consumer_;
+
+  [mediator_ webState:mediator_.webState didChangeLoadingProgress:0.42];

[sczs, 2017/05/05 23:15:45]

I've tried to trigger this by opening a URL with the testwebstate but its not
working. Will ask around or will keep digging to find a better way to do it. In
any case I want to send this CL so PAR can get an overall look on Monday. 

Any ideas are welcome :) 

[marq (ping after 24h), 2017/05/09 12:07:31]

I don't think you'll get any loading progress updates from anything that's not
loading a live WebState. While this isn't ideal, I think it's a reasonable
compromise for now.

+  [[consumer_ verify] setLoadingProgress:0.42];
 }
 
 }  // namespace