Move toolbar_model_{impl,delegate}.{cc,h} to components/toolbar.

components/toolbar/toolbar_model_impl.h

 // Copyright 2012 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.
 
-#ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
-#define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
+#ifndef COMPONENTS_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
+#define COMPONENTS_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/toolbar/toolbar_model.h"
 #include "url/gurl.h"
 
 class ToolbarModelDelegate;
 
-namespace content {
-class NavigationController;
-class WebContents;
-}
-
 namespace net {
 class X509Certificate;
 }
 
 // This class is the model used by the toolbar, location bar and autocomplete
 // edit.  It populates its states from the current navigation entry retrieved
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModelImpl : public ToolbarModel {

[Peter Kasting, 2016/02/02 23:38:56]

Do we still need to separate the abstract base out here?  It seems like now that
these are in the same directory, the only reason for this is for the test code
to be able to create its own implementation.  If it could get by with the "real"
implementation, we could just collapse these classes.

[sdefresne, 2016/02/04 10:35:34]

=> crbug.com/584195

  public:
   ToolbarModelImpl(ToolbarModelDelegate* delegate,
                    size_t max_url_display_chars);
   ~ToolbarModelImpl() override;
 
  private:
   // ToolbarModel:
   base::string16 GetText() const override;
   base::string16 GetFormattedURL(size_t* prefix_end) const override;
   base::string16 GetCorpusNameForMobile() const override;
@@ skipping 11 matching lines @@
   // replacement is enabled, editing is not in progress, etc.).  If
   // |ignore_editing| is true, the "editing not in progress" check is skipped.
   base::string16 GetSearchTerms(bool ignore_editing) const;
 
   ToolbarModelDelegate* delegate_;
   const size_t max_url_display_chars_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
 };
 
-#endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
+#endif  // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_IMPL_H_