content: change the CSSInsertRequest message to string16

content/renderer/render_view.cc

 // Copyright (c) 2011 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 "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
+#include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/bindings_policy.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/content_constants.h"
 #include "content/common/content_switches.h"
 #include "content/common/database_messages.h"
@@ skipping 3283 matching lines @@
 
 void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->setPageEncoding(WebString::fromUTF8(encoding_name));
 }
 
 void RenderView::OnResetPageEncodingToDefault() {
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
 
-WebFrame* RenderView::GetChildFrame(const std::wstring& xpath) const {
+WebFrame* RenderView::GetChildFrame(const string16& xpath) const {
   if (xpath.empty())
     return webview()->mainFrame();
 
   // xpath string can represent a frame deep down the tree (across multiple
   // frame DOMs).
   // Example, /html/body/table/tbody/tr/td/iframe\n/frameset/frame[0]
   // should break into 2 xpaths
   // /html/body/table/tbody/tr/td/iframe & /frameset/frame[0]
+  std::vector<string16> xpaths;
+  SplitString(xpath, '\n', &xpaths);
 
   WebFrame* frame = webview()->mainFrame();
-
-  std::wstring xpath_remaining = xpath;
-  while (!xpath_remaining.empty()) {
-    std::wstring::size_type delim_pos = xpath_remaining.find_first_of(L'\n');
-    std::wstring xpath_child;
-    if (delim_pos != std::wstring::npos) {
-      xpath_child = xpath_remaining.substr(0, delim_pos);
-      xpath_remaining.erase(0, delim_pos + 1);
-    } else {
-      xpath_remaining.swap(xpath_child);
-    }
-    frame = frame->findChildByExpression(WideToUTF16Hack(xpath_child));
+  for (std::vector<string16>::const_iterator i = xpaths.begin();
+       frame && i != xpaths.end(); ++i) {
+    frame = frame->findChildByExpression(*i);
   }
 
   return frame;
 }
 
 WebNode RenderView::GetFocusedNode() const {
   if (!webview())
     return WebNode();
   WebFrame* focused_frame = webview()->focusedFrame();
   if (focused_frame) {
@@ skipping 16 matching lines @@
     }
   }
   return is_editable_node;
 }
 
 void RenderView::EvaluateScript(const string16& frame_xpath,
                                 const string16& script,
                                 int id,
                                 bool notify_result) {
   v8::Handle<v8::Value> result;
-  WebFrame* web_frame = GetChildFrame(UTF16ToWideHack(frame_xpath));
+  WebFrame* web_frame = GetChildFrame(frame_xpath);
   if (web_frame)
     result = web_frame->executeScriptAndReturnValue(WebScriptSource(script));
   if (notify_result) {
     ListValue list;
     if (!result.IsEmpty() && web_frame) {
       v8::HandleScope handle_scope;
       v8::Local<v8::Context> context = web_frame->mainWorldScriptContext();
       v8::Context::Scope context_scope(context);
       V8ValueConverter converter;
       converter.set_allow_date(true);
       converter.set_allow_regexp(true);
       list.Set(0, converter.FromV8Value(result, context));
     } else {
       list.Set(0, Value::CreateNullValue());
     }
     Send(new ViewHostMsg_ScriptEvalResponse(routing_id_, id, list));
   }
 }
 
 void RenderView::OnScriptEvalRequest(const string16& frame_xpath,
                                      const string16& jscript,
                                      int id,
                                      bool notify_result) {
   EvaluateScript(frame_xpath, jscript, id, notify_result);
 }
 
-void RenderView::OnCSSInsertRequest(const std::wstring& frame_xpath,
+void RenderView::OnCSSInsertRequest(const string16& frame_xpath,
                                     const std::string& css) {
   WebFrame* frame = GetChildFrame(frame_xpath);
   if (!frame)
     return;
 
   frame->document().insertUserStyleSheet(
       WebString::fromUTF8(css),
       WebDocument::UserStyleAuthorLevel);
 }
 
@@ skipping 1012 matching lines @@
 }
 #endif
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }