| Index: webkit/common/dom_storage/dom_storage_types.h
|
| diff --git a/webkit/common/dom_storage/dom_storage_types.h b/webkit/common/dom_storage/dom_storage_types.h
|
| index af3d6c494d92f344b1ab93e0a76c7940badfff5a..bfd1bfe0c5af02e38db9af1b24f3e40a42e39cd2 100644
|
| --- a/webkit/common/dom_storage/dom_storage_types.h
|
| +++ b/webkit/common/dom_storage/dom_storage_types.h
|
| @@ -8,7 +8,7 @@
|
| #include <map>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/nullable_string16.h"
|
| +#include "base/strings/nullable_string16.h"
|
| #include "base/strings/string16.h"
|
| #include "base/time.h"
|
| #include "googleurl/src/gurl.h"
|
| @@ -38,7 +38,7 @@ const int64 kMaxInMemoryAreas = 100;
|
| // Value to indicate an area that not be opened.
|
| const int kInvalidAreaId = -1;
|
|
|
| -typedef std::map<base::string16, NullableString16> ValuesMap;
|
| +typedef std::map<base::string16, base::NullableString16> ValuesMap;
|
|
|
| struct WEBKIT_COMMON_EXPORT LocalStorageUsageInfo {
|
| GURL origin;
|
|
|