Fixing Firefox 21+ password import

chrome/utility/importer/firefox_importer.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 "chrome/utility/importer/firefox_importer.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 365 matching lines @@
 
 void FirefoxImporter::ImportHomepage() {
   GURL home_page = GetHomepage(source_path_);
   if (home_page.is_valid() && !IsDefaultHomepage(home_page, app_path_)) {
     bridge_->AddHomePage(home_page);
   }
 }
 
 void FirefoxImporter::GetSearchEnginesXMLData(
     std::vector<std::string>* search_engine_data) {
+  // TODO(mpawlowski): This may no longer work, search engines are stored in
+  // search.json since Firefox 3.5, not in search.sqlite. XML definitions are
+  // still necessary. http://crbug.com/329175
   base::FilePath file = source_path_.AppendASCII("search.sqlite");
   if (!base::PathExists(file))
     return;
 
   sql::Connection db;
   if (!db.Open(file))
     return;
 
   const char* query = "SELECT engineid FROM engine_data "
                       "WHERE engineid NOT IN "
                       "(SELECT engineid FROM engine_data "
                       "WHERE name='hidden') "
                       "ORDER BY value ASC";
 
   sql::Statement s(db.GetUniqueStatement(query));
   if (!s.is_valid())
     return;
 
-  base::FilePath app_path = app_path_.AppendASCII("searchplugins");
-  base::FilePath profile_path = source_path_.AppendASCII("searchplugins");
+  const base::FilePath searchplugins_path("searchplugins");
+  // Search engine definitions are XMLs stored in two directories. Default
+  // engines are in the app directory (app_path_) and custom engines are
+  // in the profile directory (source_path_).
+
+  // Since Firefox 21, app_path_ engines are in 'browser' subdirectory:
+  base::FilePath app_path =
+      app_path_.AppendASCII("browser").Append(searchplugins_path);
+  if (!base::PathExists(app_path))
+    // This might be an older Firefox, try old location without the 'browser'
+    // path component:
+    app_path = app_path_.Append(searchplugins_path);

[Ilya Sherman, 2013/12/17 23:04:14]

nit: Please add curly braces, since the body of this if-stmt spans multiple
lines of text.

+
+  base::FilePath profile_path = source_path_.Append(searchplugins_path);
 
   // Firefox doesn't store a search engine in its sqlite database unless the
   // user has added a engine. So we get search engines from sqlite db as well
   // as from the file system.
   if (s.Step()) {
     const std::string kAppPrefix("[app]/");
     const std::string kProfilePrefix("[profile]/");
     do {
       base::FilePath file;
       std::string engine(s.ColumnString(0));
@@ skipping 179 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }