Reland of place string::find(prefix) == 0 pattern with base::StartsWith().

content/browser/dom_storage/session_storage_database_unittest.cc

 // Copyright 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 "content/browser/dom_storage/session_storage_database.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/iterator.h"
 #include "third_party/leveldatabase/src/include/leveldb/options.h"
 #include "url/gurl.h"
 
 namespace content {
 
@@ skipping 76 matching lines @@
 
 void SessionStorageDatabaseTest::ResetDatabase() {
   db_ = new SessionStorageDatabase(temp_dir_.path());
   ASSERT_TRUE(db_->LazyOpen(true));
 }
 
 // static
 bool SessionStorageDatabaseTest::IsNamespaceKey(const std::string& key,
                                                 std::string* namespace_id) {
   std::string namespace_prefix = SessionStorageDatabase::NamespacePrefix();
-  if (key.find(namespace_prefix) != 0)
+  if (!base::StartsWith(key, namespace_prefix, base::CompareCase::SENSITIVE))
     return false;
   if (key == namespace_prefix)
     return false;
 
   size_t second_dash = key.find('-', namespace_prefix.length());
   if (second_dash != key.length() - 1)
     return false;
 
   // Key is of the form "namespace-<namespaceid>-".
   *namespace_id = key.substr(
       namespace_prefix.length(),
       second_dash - namespace_prefix.length());
   return true;
 }
 
 // static
 bool SessionStorageDatabaseTest::IsNamespaceOriginKey(
     const std::string& key,
     std::string* namespace_id) {
   std::string namespace_prefix = SessionStorageDatabase::NamespacePrefix();
-  if (key.find(namespace_prefix) != 0)
+  if (!base::StartsWith(key, namespace_prefix, base::CompareCase::SENSITIVE))
     return false;
   size_t second_dash = key.find('-', namespace_prefix.length());
   if (second_dash == std::string::npos || second_dash == key.length() - 1)
     return false;
 
   // Key is of the form "namespace-<namespaceid>-<origin>", and the value
   // is the map id.
   *namespace_id = key.substr(
       namespace_prefix.length(),
       second_dash - namespace_prefix.length());
   return true;
 }
 
 // static
 bool SessionStorageDatabaseTest::IsMapRefCountKey(const std::string& key,
                                                   int64_t* map_id) {
   std::string map_prefix = "map-";
-  if (key.find(map_prefix) != 0)
+  if (!base::StartsWith(key, map_prefix, base::CompareCase::SENSITIVE))
     return false;
   size_t second_dash = key.find('-', map_prefix.length());
   if (second_dash != key.length() - 1)
     return false;
   // Key is of the form "map-<mapid>-" and the value is the ref count.
   std::string map_id_str = key.substr(map_prefix.length(),
                                       second_dash - map_prefix.length());
   bool conversion_ok = base::StringToInt64(map_id_str, map_id);
   EXPECT_TRUE(conversion_ok);
   return true;
 }
 
 // static
 bool SessionStorageDatabaseTest::IsMapValueKey(const std::string& key,
                                                int64_t* map_id) {
   std::string map_prefix = "map-";
-  if (key.find(map_prefix) != 0)
+  if (!base::StartsWith(key, map_prefix, base::CompareCase::SENSITIVE))
     return false;
   size_t second_dash = key.find('-', map_prefix.length());
   if (second_dash == std::string::npos || second_dash == key.length() - 1)
     return false;
   // Key is of the form "map-<mapid>-key".
   std::string map_id_str = key.substr(map_prefix.length(),
                                       second_dash - map_prefix.length());
   bool conversion_ok = base::StringToInt64(map_id_str, map_id);
   EXPECT_TRUE(conversion_ok);
   return true;
@@ skipping 609 matching lines @@
   ASSERT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin2, false, data2));
 
   EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin1));
   EXPECT_TRUE(db_->DeleteArea(kNamespace1, kOrigin2));
   // Check that also the namespace start key was deleted.
   CheckDatabaseConsistency();
 }
 
 
 }  // namespace content