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

components/toolbar/toolbar_model_impl.cc

 // 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.
 
-#include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
+#include "components/toolbar/toolbar_model_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "components/google/core/browser/google_util.h"
+#include "components/grit/components_scaled_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/security_state/security_state_model.h"
+#include "components/strings/grit/components_strings.h"
+#include "components/toolbar/toolbar_model_delegate.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
-#include "grit/components_scaled_resources.h"
-#include "grit/components_strings.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 
 using security_state::SecurityStateModel;
 
 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate,
@@ skipping 39 matching lines @@
 }
 
 base::string16 ToolbarModelImpl::GetCorpusNameForMobile() const {
   if (!WouldPerformSearchTermReplacement(false))
     return base::string16();
   GURL url(GetURL());
   // If there is a query in the url fragment look for the corpus name there,
   // otherwise look for the corpus name in the query parameters.
   const std::string& query_str(google_util::HasGoogleSearchQueryParam(
       url.ref_piece()) ? url.ref() : url.query());
-  url::Component query(0, query_str.length()), key, value;
+  url::Component query(0, static_cast<int>(query_str.length())), key, value;
   const char kChipKey[] = "sboxchip";
   while (url::ExtractQueryKeyValue(query_str.c_str(), &query, &key, &value)) {
     if (key.is_nonempty() && query_str.substr(key.begin, key.len) == kChipKey) {
       return net::UnescapeAndDecodeUTF8URLComponent(
           query_str.substr(value.begin, value.len),
           net::UnescapeRule::NORMAL);
     }
   }
   return base::string16();
 }
@@ skipping 78 matching lines @@
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }
 
 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
   if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing))
     return base::string16();
 
   return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));
 }