Move EmptyString, kWhitespace and the BOM to base.

ui/oak/oak_aura_window_display.cc

 // Copyright (c) 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 "ui/oak/oak_aura_window_display.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 81 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // OakAuraWindowDisplay, ui::TableModel implementation:
 
 int OakAuraWindowDisplay::RowCount() {
   return ROW_COUNT;
 }
 
 base::string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
   if (!window_)
-    return EmptyString16();
+    return base::string16();
 
   base::string16 text;
   switch (row) {
     case ROW_ID:
       return PropertyWithInteger("Id: ", window_->id());
     case ROW_DELEGATE:
       return PropertyWithVoidStar("Delegate: ", window_->delegate());
     case ROW_TYPE:
       return PropertyWithWindowType(window_->type());
     case ROW_NAME:
@@ skipping 33 matching lines @@
     case ROW_HITTESTBOUNDSOVERRIDEOUTER:
       return PropertyWithInsets("Hit test bounds override outer: ",
           window_->hit_test_bounds_override_outer_mouse());
     case ROW_HITTESTBOUNDSOVERRIDEINNER:
       return PropertyWithInsets("Hit test bounds override inner: ",
                                 window_->hit_test_bounds_override_inner());
     default:
       NOTREACHED();
       break;
   }
-  return EmptyString16();
+  return base::string16();
 }
 
 void OakAuraWindowDisplay::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 }  // namespace internal
 }  // namespace oak