Move EmptyString, kWhitespace and the BOM to base.

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.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/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
@@ skipping 482 matching lines @@
   SetTextAndSelectedRange(text, range);
 
   if (update_popup)
     UpdatePopup();
 
   if (notify_text_changed)
     TextChanged();
 }
 
 void OmniboxViewGtk::SetForcedQuery() {
-  const string16 current_text(GetText());
-  const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
+  const base::string16 current_text(GetText());
+  const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);
   if (start == string16::npos || (current_text[start] != '?')) {
     SetUserText(ASCIIToUTF16("?"));
   } else {
     StartUpdatingHighlightedText();
     SetSelectedRange(CharRange(current_text.size(), start + 1));
     FinishUpdatingHighlightedText();
   }
 }
 
 bool OmniboxViewGtk::IsSelectAll() const {
@@ skipping 1611 matching lines @@
 void OmniboxViewGtk::AdjustVerticalAlignmentOfGrayTextView() {
   // By default, GtkTextView layouts an anchored child widget just above the
   // baseline, so we need to move the |gray_text_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(gray_text_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   int baseline = pango_layout_get_baseline(layout);
   g_object_set(gray_text_anchor_tag_, "rise", baseline - height, NULL);
 }