Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/chrome/test/chromedriver/element_util.cc

 // Copyright (c) 2013 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/test/chromedriver/element_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
@@ skipping 320 matching lines @@
     const std::string& element_id,
     const std::string& attribute_name,
     const std::string& attribute_value,
     bool* is_equal) {
   scoped_ptr<base::Value> result;
   Status status = GetElementAttribute(
       session, web_view, element_id, attribute_name, &result);
   if (status.IsError())
     return status;
   std::string actual_value;
-  if (result->GetAsString(&actual_value)) {
-    *is_equal =
-        base::LowerCaseEqualsASCII(actual_value, attribute_value.c_str());
-  } else {
+  if (result->GetAsString(&actual_value))
+    *is_equal = LowerCaseEqualsASCII(actual_value, attribute_value.c_str());
+  else
     *is_equal = false;
-  }
   return status;
 }
 
 Status GetElementClickableLocation(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     WebPoint* location) {
   std::string tag_name;
   Status status = GetElementTagName(session, web_view, element_id, &tag_name);
@@ skipping 295 matching lines @@
     status = ScrollElementRegionIntoViewHelper(
         rit->parent_frame_id, web_view, frame_element_id,
         WebRect(region_offset, region_size),
         center, frame_element_id, &region_offset);
     if (status.IsError())
       return status;
   }
   *location = region_offset;
   return Status(kOk);
 }