Revert "Rewrite std::string("") to std::string(), Linux edition."

This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.

Revert "Fix build after r193020."

This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.

Revert "Really fix build after r193020."

This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/ppapi/examples/ime/ime.cc b/ppapi/examples/ime/ime.cc
index 6f3e655..f5e2e44 100644
--- a/ppapi/examples/ime/ime.cc
+++ b/ppapi/examples/ime/ime.cc
@@ -245,7 +245,7 @@ class MyTextField {
       int32_t target_segment,
       const std::pair<uint32_t, uint32_t>& selection) {
     if (HasSelection() && !text.empty())
-      InsertText(std::string());
+      InsertText("");
     composition_ = text;
     segments_ = segments;
     target_segment_ = target_segment;
@@ -344,7 +344,7 @@ class MyTextField {
     if (!Focused())
       return;
     if (HasSelection()) {
-      InsertText(std::string());
+      InsertText("");
     } else {
       size_t i = GetNextCharOffsetUtf8(utf8_text_, caret_pos_);
       utf8_text_.erase(caret_pos_, i - caret_pos_);
@@ -356,7 +356,7 @@ class MyTextField {
     if (!Focused())
       return;
     if (HasSelection()) {
-      InsertText(std::string());
+      InsertText("");
     } else if (caret_pos_ != 0) {
       size_t i = GetPrevCharOffsetUtf8(utf8_text_, caret_pos_);
       utf8_text_.erase(i, caret_pos_ - i);
@@ -565,10 +565,8 @@ class MyInstance : public pp::Instance {
          it != textfield_.end();
          ++it) {
       if (it->Focused()) {
-        it->SetComposition(std::string(),
-                           std::vector<std::pair<uint32_t, uint32_t> >(),
-                           0,
-                           std::make_pair(0, 0));
+        it->SetComposition("", std::vector< std::pair<uint32_t, uint32_t> >(),
+                           0, std::make_pair(0, 0));
         return true;
       }
     }