Use base namespace for string16 in chrome/renderer.

chrome/renderer/searchbox/searchbox_extension.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/renderer/searchbox/searchbox_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 38 matching lines @@
 const char kCSSBackgroundRepeat[] = "repeat";
 
 const char kThemeAttributionFormat[] = "-webkit-image-set("
     "url(chrome-search://theme/IDR_THEME_NTP_ATTRIBUTION?%s) 1x, "
     "url(chrome-search://theme/IDR_THEME_NTP_ATTRIBUTION@2x?%s) 2x)";
 
 const char kLTRHtmlTextDirection[] = "ltr";
 const char kRTLHtmlTextDirection[] = "rtl";
 
 // Converts a V8 value to a string16.
-string16 V8ValueToUTF16(v8::Handle<v8::Value> v) {
+base::string16 V8ValueToUTF16(v8::Handle<v8::Value> v) {
   v8::String::Value s(v);
-  return string16(reinterpret_cast<const char16*>(*s), s.length());
+  return base::string16(reinterpret_cast<const char16*>(*s), s.length());
 }
 
 // Converts string16 to V8 String.
 v8::Handle<v8::String> UTF16ToV8String(v8::Isolate* isolate,
-                                       const string16& s) {
+                                       const base::string16& s) {
   return v8::String::NewFromTwoByte(isolate,
                                     reinterpret_cast<const uint16_t*>(s.data()),
                                     v8::String::kNormalString,
                                     s.size());
 }
 
 // Converts std::string to V8 String.
 v8::Handle<v8::String> UTF8ToV8String(v8::Isolate* isolate,
                                       const std::string& s) {
   return v8::String::NewFromUtf8(
@@ skipping 34 matching lines @@
   // title as "MSDN: Microsoft D...". As another example, the title of
   // http://yahoo.com is "Yahoo!". In RTL locales, in the New Tab page, the
   // title will be rendered as "!Yahoo" if its "dir" attribute is not set to
   // "ltr".
   std::string direction;
   if (base::i18n::StringContainsStrongRTLChars(mv_item.title))
     direction = kRTLHtmlTextDirection;
   else
     direction = kLTRHtmlTextDirection;
 
-  string16 title = mv_item.title;
+  base::string16 title = mv_item.title;
   if (title.empty())
     title = UTF8ToUTF16(mv_item.url.spec());
 
   v8::Handle<v8::Object> obj = v8::Object::New();
   obj->Set(v8::String::NewFromUtf8(isolate, "renderViewId"),
            v8::Int32::New(isolate, render_view_id));
   obj->Set(v8::String::NewFromUtf8(isolate, "rid"),
            v8::Int32::New(isolate, restricted_id));
   obj->Set(v8::String::NewFromUtf8(isolate, "thumbnailUrl"),
            GenerateThumbnailURL(isolate, render_view_id, restricted_id));
@@ skipping 46 matching lines @@
   v8::Handle<v8::Array> color_array = v8::Array::New(isolate, 4);
   color_array->Set(0, v8::Int32::New(isolate, color.r));
   color_array->Set(1, v8::Int32::New(isolate, color.g));
   color_array->Set(2, v8::Int32::New(isolate, color.b));
   color_array->Set(3, v8::Int32::New(isolate, color.a));
   return color_array;
 }
 
 // Resolves a possibly relative URL using the current URL.
 GURL ResolveURL(const GURL& current_url,
-                const string16& possibly_relative_url) {
+                const base::string16& possibly_relative_url) {
   if (current_url.is_valid() && !possibly_relative_url.empty())
     return current_url.Resolve(possibly_relative_url);
   return GURL(possibly_relative_url);
 }
 
 }  // namespace internal
 
 namespace extensions_v8 {
 
 static const char kSearchBoxExtensionName[] = "v8/EmbeddedSearch";
@@ skipping 251 matching lines @@
 bool SearchBoxExtension::PageSupportsInstant(blink::WebFrame* frame) {
   if (!frame) return false;
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
   v8::Handle<v8::Value> v = frame->executeScriptAndReturnValue(
       blink::WebScriptSource(kSupportsInstantScript));
   return !v.IsEmpty() && v->BooleanValue();
 }
 
 // static
 void SearchBoxExtension::DispatchChromeIdentityCheckResult(
-    blink::WebFrame* frame, const string16& identity, bool identity_match) {
+    blink::WebFrame* frame,
+    const base::string16& identity,
+    bool identity_match) {
   std::string escaped_identity;
   base::JsonDoubleQuote(identity, true, &escaped_identity);
   blink::WebString script(UTF8ToUTF16(base::StringPrintf(
       kDispatchChromeIdentityCheckResult,
       escaped_identity.c_str(),
       identity_match ? "true" : "false")));
   Dispatch(frame, script);
 }
 
 // static
@@ skipping 209 matching lines @@
   v8::Isolate* isolate = args.GetIsolate();
   args.GetReturnValue().Set(GenerateMostVisitedItem(
       isolate, render_view->GetRoutingID(), restricted_id, mv_item));
 }
 
 // static
 void SearchBoxExtensionWrapper::GetQuery(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return;
-  const string16& query = SearchBox::Get(render_view)->query();
+  const base::string16& query = SearchBox::Get(render_view)->query();
   DVLOG(1) << render_view << " GetQuery: '" << query << "'";
   v8::Isolate* isolate = args.GetIsolate();
   args.GetReturnValue().Set(UTF16ToV8String(isolate, query));
 }
 
 // static
 void SearchBoxExtensionWrapper::GetRightToLeft(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(base::i18n::IsRTL());
 }
@@ skipping 242 matching lines @@
   // Check if the url is a rid
   if (args[0]->IsNumber()) {
     InstantMostVisitedItem item;
     if (SearchBox::Get(render_view)->GetMostVisitedItemWithID(
             args[0]->IntegerValue(), &item)) {
       destination_url = item.url;
       is_most_visited_item_url = true;
     }
   } else {
     // Resolve the URL
-    const string16& possibly_relative_url = V8ValueToUTF16(args[0]);
+    const base::string16& possibly_relative_url = V8ValueToUTF16(args[0]);
     GURL current_url = GetCurrentURL(render_view);
     destination_url = internal::ResolveURL(current_url, possibly_relative_url);
   }
 
   DVLOG(1) << render_view << " NavigateContentWindow: " << destination_url;
 
   // Navigate the main frame.
   if (destination_url.is_valid()) {
     WindowOpenDisposition disposition = CURRENT_TAB;
     if (args[1]->Uint32Value() == 2)
       disposition = NEW_BACKGROUND_TAB;
     SearchBox::Get(render_view)->NavigateToURL(destination_url, disposition,
                                                is_most_visited_item_url);
   }
 }
 
 // static
 void SearchBoxExtensionWrapper::Paste(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return;
 
-  string16 text;
+  base::string16 text;
   if (!args[0]->IsUndefined())
     text = V8ValueToUTF16(args[0]);
 
   DVLOG(1) << render_view << " Paste: " << text;
   SearchBox::Get(render_view)->Paste(text);
 }
 
 // static
 void SearchBoxExtensionWrapper::StartCapturingKeyStrokes(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
@@ skipping 51 matching lines @@
   if (!render_view) return;
 
   bool display_instant_results =
       SearchBox::Get(render_view)->display_instant_results();
   DVLOG(1) << render_view << " GetDisplayInstantResults" <<
       display_instant_results;
   args.GetReturnValue().Set(display_instant_results);
 }
 
 }  // namespace extensions_v8