Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/i18n/break_iterator.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 "base/i18n/break_iterator.h"
 
 #include "base/logging.h"
 #include "third_party/icu/source/common/unicode/ubrk.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/ustring.h"
@@ skipping 56 matching lines @@
       NOTREACHED() << "ubrk_openRules failed to parse rule string at line "
           << parse_error.line << ", offset " << parse_error.offset;
     }
   } else {
     iter_ = ubrk_open(break_type,
                       NULL,
                       string_.data(),
                       static_cast<int32_t>(string_.size()),
                       &status);
     if (U_FAILURE(status)) {
-      NOTREACHED() << "ubrk_open failed for type " << break_type
-          << " with error " << status;
+      NOTREACHED() << "ubrk_open failed";
     }
   }
 
   if (U_FAILURE(status)) {
     return false;
   }
 
   // Move the iterator to the beginning of the string.
   ubrk_first(static_cast<UBreakIterator*>(iter_));
   return true;
@@ skipping 88 matching lines @@
   return GetStringPiece().as_string();
 }
 
 StringPiece16 BreakIterator::GetStringPiece() const {
   DCHECK(prev_ != npos && pos_ != npos);
   return string_.substr(prev_, pos_ - prev_);
 }
 
 }  // namespace i18n
 }  // namespace base