Move nullable_string16.h to the string subdirectory.

webkit/browser/dom_storage/dom_storage_database.cc

 // Copyright (c) 2012 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 "webkit/browser/dom_storage/dom_storage_database.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "sql/statement.h"
@@ skipping 60 matching lines @@
     return;
 
   sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
                                                    "SELECT * from ItemTable"));
   DCHECK(statement.is_valid());
 
   while (statement.Step()) {
     base::string16 key = statement.ColumnString16(0);
     base::string16 value;
     statement.ColumnBlobAsString16(1, &value);
-    (*result)[key] = NullableString16(value, false);
+    (*result)[key] = base::NullableString16(value, false);
   }
   known_to_be_empty_ = result->empty();
 }
 
 bool DomStorageDatabase::CommitChanges(bool clear_all_first,
                                        const ValuesMap& changes) {
   if (!LazyOpen(!changes.empty())) {
     // If we're being asked to commit changes that will result in an
     // empty database, we return true if the database file doesn't exist.
     return clear_all_first && changes.empty() &&
@@ skipping 10 matching lines @@
       return false;
     known_to_be_empty_ = true;
   }
 
   bool did_delete = false;
   bool did_insert = false;
   ValuesMap::const_iterator it = changes.begin();
   for(; it != changes.end(); ++it) {
     sql::Statement statement;
     base::string16 key = it->first;
-    NullableString16 value = it->second;
+    base::NullableString16 value = it->second;
     if (value.is_null()) {
       statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE,
          "DELETE FROM ItemTable WHERE key=?"));
       statement.BindString16(0, key);
       did_delete = true;
     } else {
       statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE,
           "INSERT INTO ItemTable VALUES (?,?)"));
       statement.BindString16(0, key);
       statement.BindBlob(1, value.string().data(),
@@ skipping 159 matching lines @@
   sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
       "SELECT * FROM ItemTable"));
   DCHECK(statement.is_valid());
 
   // Need to migrate from TEXT value column to BLOB.
   // Store the current database content so we can re-insert
   // the data into the new V2 table.
   ValuesMap values;
   while (statement.Step()) {
     base::string16 key = statement.ColumnString16(0);
-    NullableString16 value(statement.ColumnString16(1), false);
+    base::NullableString16 value(statement.ColumnString16(1), false);
     values[key] = value;
   }
 
   sql::Transaction migration(db_.get());
   return migration.Begin() &&
       db_->Execute("DROP TABLE ItemTable") &&
       CreateTableV2() &&
       CommitChanges(false, values) &&
       migration.Commit();
 }
 
 void DomStorageDatabase::Close() {
   db_.reset(NULL);
 }
 
 }  // namespace dom_storage