ui/aura: Use base::string16 now that string16 was moved into base namespace.

ui/aura/client/tooltip_client.cc

Index: ui/aura/client/tooltip_client.cc
diff --git a/ui/aura/client/tooltip_client.cc b/ui/aura/client/tooltip_client.cc
index 79883251fac6f92ec54de6059af62b6d7c2e0bea..a966c28392ce126b366017423daa8ba6d72e8b19 100644
--- a/ui/aura/client/tooltip_client.cc
+++ b/ui/aura/client/tooltip_client.cc
@@ -8,14 +8,14 @@
 #include "ui/aura/window_property.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*)
-DECLARE_WINDOW_PROPERTY_TYPE(string16*)
+DECLARE_WINDOW_PROPERTY_TYPE(base::string16*)
 
 namespace aura {
 namespace client {
 
 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
     TooltipClient*, kRootWindowTooltipClientKey, NULL);
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(string16*, kTooltipTextKey, NULL);
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
 
 void SetTooltipClient(RootWindow* root_window, TooltipClient* client) {
   root_window->SetProperty(kRootWindowTooltipClientKey, client);
@@ -26,13 +26,13 @@ TooltipClient* GetTooltipClient(RootWindow* root_window) {
       root_window->GetProperty(kRootWindowTooltipClientKey) : NULL;
 }
 
-void SetTooltipText(Window* window, string16* tooltip_text) {
+void SetTooltipText(Window* window, base::string16* tooltip_text) {
   window->SetProperty(kTooltipTextKey, tooltip_text);
 }
 
-const string16 GetTooltipText(Window* window) {
-  string16* string_ptr = window->GetProperty(kTooltipTextKey);
-  return string_ptr ? *string_ptr : string16();
+const base::string16 GetTooltipText(Window* window) {
+  base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
+  return string_ptr ? *string_ptr : base::string16();
 }
 
 }  // namespace client