Remove OriginChip code.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index affbd0901f45d9ccdeada6d878eb088d43675eae..635ae15b974811de92b3e646020f9169c9d3c759 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1003,10 +1003,8 @@ void BrowserView::SetFocusToLocationBar(bool select_all) {
     // Location bar got focus.
     //
     // select_all is true when it's expected that the user may want to copy
-    // the URL to the clipboard. If the URL is not being shown because the
-    // origin chip is enabled, show it now to support the same functionality.
-    if (select_all &&
-        location_bar->GetToolbarModel()->WouldOmitURLDueToOriginChip())
+    // the URL to the clipboard.
+    if (select_all)

[Justin Donnelly, 2014/11/21 19:15:24]

If we get rid of the search button then these few lines can revert to their
original state, which is just the one line in the else clause.

See
https://codereview.chromium.org/111873004/diff/40001/chrome/browser/ui/views/...
for the original change.

[groby-ooo-7-16, 2014/12/02 18:40:10]

We can get rid of them even without the search button, since it only depends on
WouldOmitDueToOriginChip.

Either way, I'll have a pipelined CL for the search button - I'm happy to submit
both combined into one, once they're reviewed, but I figured I make it a tad
easier on the reviewers :)

       location_bar->ShowURL();
     else
       location_bar->FocusLocation(select_all);