Navigation: move RestoreType and ReloadType into a separate file

chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_sync_observer.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 27 matching lines @@
  public:
   explicit MockWebContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents) {}
   virtual ~MockWebContentsObserver() {}
 
   // A hook to verify that the OneClickSigninSyncObserver initiated a redirect
   // to the continue URL. Navigations in unit_tests never complete, but a
   // navigation start is a sufficient signal for the purposes of this test.
   // Listening for this call also has the advantage of being synchronous.
   MOCK_METHOD2(DidStartNavigationToPendingEntry,
-               void(const GURL&, content::NavigationController::ReloadType));
+               void(const GURL&, content::ReloadType));
 };
 
 class OneClickTestProfileSyncService : public TestProfileSyncService {
  public:
   ~OneClickTestProfileSyncService() override {}
 
   // Helper routine to be used in conjunction with
   // BrowserContextKeyedServiceFactory::SetTestingFactory().
   static std::unique_ptr<KeyedService> Build(content::BrowserContext* profile) {
     return base::WrapUnique(new OneClickTestProfileSyncService(
@@ skipping 190 matching lines @@
       signin_metrics::Reason::REASON_SIGNIN_PRIMARY_ACCOUNT, false);
   CreateSyncObserver(continue_url.spec());
   sync_service_->set_first_setup_in_progress(false);
   sync_service_->set_sync_active(true);
 
   EXPECT_CALL(*web_contents_observer_,
               DidStartNavigationToPendingEntry(_, _)).Times(0);
   sync_service_->NotifyObservers();
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }