Fix a couple of firefox search engine import bugs.

chrome/browser/importer/firefox_importer_utils.cc

 // Copyright (c) 2010 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/browser/importer/firefox_importer_utils.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 264 matching lines @@
 
   return content.substr(start + 1, stop - start - 1);
 }
 
 std::string ReadPrefsJsValue(const FilePath& profile_path,
                              const std::string& pref_key) {
   std::string content;
   if (!ReadPrefFile(profile_path.AppendASCII("prefs.js"), &content))
     return "";
 
-  // This file has the syntax: user_pref("key", value);
-  std::string search_for = std::string("user_pref(\"") + pref_key +
-                           std::string("\", ");
-  size_t prop_index = content.find(search_for);
-  if (prop_index == std::string::npos)
-    return "";
-
-  size_t start = prop_index + search_for.length();
-  size_t stop = std::string::npos;
-  if (start != std::string::npos)
-    stop = content.find(")", start + 1);
-
-  if (start == std::string::npos || stop == std::string::npos) {
-    NOTREACHED() << "Firefox property " << pref_key << " could not be parsed.";
-    return "";
-  }
-
-  // String values have double quotes we don't need to return to the caller.
-  if (content[start] == '\"' && content[stop - 1] == '\"') {
-    ++start;
-    --stop;
-  }
-
-  return content.substr(start, stop - start);
+  return GetPrefsJsValue(content, pref_key);
 }
 
 int GetFirefoxDefaultSearchEngineIndex(
     const std::vector<TemplateURL*>& search_engines,
     const FilePath& profile_path) {
   // The default search engine is contained in the file prefs.js found in the
   // profile directory.
   // It is the "browser.search.selectedEngine" property.
   if (search_engines.empty())
     return -1;
 
-  std::wstring default_se_name = UTF8ToWide(
-      ReadPrefsJsValue(profile_path, "browser.search.selectedEngine"));
+  std::string default_se_name =
+      ReadPrefsJsValue(profile_path, "browser.search.selectedEngine");
 
   if (default_se_name.empty()) {
     // browser.search.selectedEngine does not exist if the user has not changed
     // from the default (or has selected the default).
     // TODO: should fallback to 'browser.search.defaultengine' if selectedEngine
     // is empty.
     return -1;
   }
 
   int default_se_index = -1;
   for (std::vector<TemplateURL*>::const_iterator iter = search_engines.begin();
        iter != search_engines.end(); ++iter) {
-    if (default_se_name == (*iter)->short_name()) {
+    if (default_se_name == WideToUTF8((*iter)->short_name())) {
       default_se_index = static_cast<int>(iter - search_engines.begin());
       break;
     }
   }
   if (default_se_index == -1) {
     NOTREACHED() <<
         "Firefox default search engine not found in search engine list";
   }
 
   return default_se_index;
@@ skipping 97 matching lines @@
     if (base::StringToInt(value, &int_value)) {
       prefs->SetInteger(key, int_value);
       continue;
     }
 
     LOG(ERROR) << "Invalid value found in Firefox pref file '" <<
           pref_file.value() << "' value is '" << value << "'.";
   }
   return true;
 }
+
+std::string GetPrefsJsValue(const std::string& content,
+                            const std::string& pref_key) {
+  // This file has the syntax: user_pref("key", value);
+  std::string search_for = std::string("user_pref(\"") + pref_key +
+                           std::string("\", ");
+  size_t prop_index = content.find(search_for);
+  if (prop_index == std::string::npos)
+    return "";
+
+  size_t start = prop_index + search_for.length();
+  size_t stop = std::string::npos;
+  if (start != std::string::npos) {
+    // Stop at the last ')' on this line.
+    stop = content.find("\n", start + 1);
+    stop = content.rfind(")", stop);
+  }
+
+  if (start == std::string::npos || stop == std::string::npos ||
+      stop < start) {
+    LOG(WARNING) << "Firefox property " << pref_key << " could not be parsed.";
+    return "";
+  }
+
+  // String values have double quotes we don't need to return to the caller.
+  if (content[start] == '\"' && content[stop - 1] == '\"') {
+    ++start;
+    --stop;
+  }
+
+  return content.substr(start, stop - start);
+}