[SiteChip] Add UMA, finish wiring site chip experiment up to the omnibox.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/views/toolbar/toolbar_view.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
@@ skipping 566 matching lines @@
   int location_x = home_->x() + home_->width() + kStandardSpacing;
   int available_width = std::max(0, width() - kRightEdgeSpacing -
       app_menu_width - browser_actions_width - location_x);
 
   // Cap site chip width at 1/2 the size available to the location bar.
   site_chip_view_->SetVisible(site_chip_view_->ShouldShow());
   int site_chip_width = site_chip_view_->GetPreferredSize().width();
   site_chip_width = std::max(0, std::min(site_chip_width,
       (available_width - kStandardSpacing) / 2));
   if (site_chip_view_->visible())
-    available_width -= site_chip_width;
+    available_width -= site_chip_width + kStandardSpacing;
 
   int location_height = location_bar_->GetPreferredSize().height();
   int location_y = (height() - location_height + 1) / 2;
   location_bar_->SetBounds(location_x, location_y, std::max(available_width, 0),
                            location_height);
   int browser_actions_x = location_bar_->bounds().right();
 
   if (site_chip_view_->visible()) {
     site_chip_view_->SetBounds(browser_actions_x + kStandardSpacing,
                                child_y,
@@ skipping 240 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }