Move RemoveChars, ReplaceChars, TrimString, and TruncateUTF8ToByteSize to base namespace.

apps/shell_window.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 "apps/shell_window.h"
 
 #include "apps/shell_window_geometry_cache.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/command_line.h"
@@ skipping 366 matching lines @@
 gfx::NativeWindow ShellWindow::GetNativeWindow() {
   return GetBaseWindow()->GetNativeWindow();
 }
 
 gfx::Rect ShellWindow::GetClientBounds() const {
   gfx::Rect bounds = native_app_window_->GetBounds();
   bounds.Inset(native_app_window_->GetFrameInsets());
   return bounds;
 }
 
-string16 ShellWindow::GetTitle() const {
+base::string16 ShellWindow::GetTitle() const {
   // WebContents::GetTitle() will return the page's URL if there's no <title>
   // specified. However, we'd prefer to show the name of the extension in that
   // case, so we directly inspect the NavigationEntry's title.
-  string16 title;
+  base::string16 title;
   if (!web_contents() ||
       !web_contents()->GetController().GetActiveEntry() ||
       web_contents()->GetController().GetActiveEntry()->GetTitle().empty()) {
     title = UTF8ToUTF16(extension()->name());
   } else {
     title = web_contents()->GetTitle();
   }
-  const char16 kBadChars[] = { '\n', 0 };
-  RemoveChars(title, kBadChars, &title);
+  const base::char16 kBadChars[] = { '\n', 0 };
+  base::RemoveChars(title, kBadChars, &title);
   return title;
 }
 
 void ShellWindow::SetAppIconUrl(const GURL& url) {
   // Avoid using any previous app icons were are being downloaded.
   image_loader_ptr_factory_.InvalidateWeakPtrs();
 
   // Reset |app_icon_image_| to abort pending image load (if any).
   app_icon_image_.reset();
 
@@ skipping 419 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps