Rewrite SimpleStringDictionary with NonAllocatingMap.

NonAllocatingMap has a near-identical interface, but is significantly less code,
more customizable, and has storage that is POD.

BUG=http://code.google.com/p/chromium/issues/detail?id=77656

Review URL: https://breakpad.appspot.com/568002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1161 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 11 insertions, 10 deletions

diff --git a/src/client/mac/crash_generation/ConfigFile.mm b/src/client/mac/crash_generation/ConfigFile.mm
index 0b7f0e15..7ff25378 100644
--- a/src/client/mac/crash_generation/ConfigFile.mm
+++ b/src/client/mac/crash_generation/ConfigFile.mm
@@ -166,15 +166,15 @@ void ConfigFile::WriteFile(const char* directory,
   BOOL result = YES;
   const SimpleStringDictionary &dictionary = *configurationParameters;
 
-  const KeyValueEntry *entry = NULL;
-  SimpleStringDictionaryIterator iter(dictionary);
+  const SimpleStringDictionary::Entry *entry = NULL;
+  SimpleStringDictionary::Iterator iter(dictionary);
 
   while ((entry = iter.Next())) {
     DEBUGLOG(stderr,
              "config: (%s) -> (%s)\n",
-             entry->GetKey(),
-             entry->GetValue());
-    result = AppendConfigString(entry->GetKey(), entry->GetValue());
+             entry->key,
+             entry->value);
+    result = AppendConfigString(entry->key, entry->value);
 
     if (!result)
       break;
diff --git a/src/client/mac/crash_generation/Inspector.h b/src/client/mac/crash_generation/Inspector.h
index 890e2157..4fb62f6b 100644
--- a/src/client/mac/crash_generation/Inspector.h
+++ b/src/client/mac/crash_generation/Inspector.h
@@ -65,13 +65,14 @@ struct InspectorInfo {
 struct KeyValueMessageData {
  public:
   KeyValueMessageData() {}
-  KeyValueMessageData(const google_breakpad::KeyValueEntry &inEntry) {
-    strlcpy(key, inEntry.GetKey(), sizeof(key) );
-    strlcpy(value, inEntry.GetValue(), sizeof(value) );
+  explicit KeyValueMessageData(
+      const google_breakpad::SimpleStringDictionary::Entry &inEntry) {
+    strlcpy(key, inEntry.key, sizeof(key) );
+    strlcpy(value, inEntry.value, sizeof(value) );
   }
 
-  char key[google_breakpad::KeyValueEntry::MAX_STRING_STORAGE_SIZE];
-  char value[google_breakpad::KeyValueEntry::MAX_STRING_STORAGE_SIZE];
+  char key[google_breakpad::SimpleStringDictionary::key_size];
+  char value[google_breakpad::SimpleStringDictionary::value_size];
 };
 
 using std::string;