Cleanup: Remove #ifdefs in extensions code that is disabled on mobile.

chrome/browser/extensions/api/bookmarks/bookmarks_api.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 <algorithm>
 
 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 843 matching lines @@
     json->GetString(keys::kTitleKey, &title);
     std::string url_string;
     json->GetString(keys::kUrlKey, &url_string);
 
     bucket_id += title;
     bucket_id += url_string;
     // 20 bytes (SHA1 hash length) is very likely less than most of the
     // |bucket_id| strings we construct here, so we hash it to save space.
     buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
   }
+
  private:
   BrowserContext* browser_context_;
 };
 
 // Mapper for 'bookmarks.remove'.
 class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> {
  public:
   explicit RemoveBookmarksBucketMapper(BrowserContext* context)
       : browser_context_(context) {}
   virtual void GetBucketsForArgs(const base::ListValue* args,
@@ skipping 13 matching lines @@
       if (!node || node->is_root())
         return;
 
       std::string bucket_id;
       bucket_id += base::UTF16ToUTF8(node->parent()->GetTitle());
       bucket_id += base::UTF16ToUTF8(node->GetTitle());
       bucket_id += node->url().spec();
       buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
     }
   }
+
  private:
   BrowserContext* browser_context_;
 };
 
 // Mapper for any bookmark function accepting bookmark IDs as parameters, where
 // a distinct ID corresponds to a single item in terms of quota limiting.  This
 // is inappropriate for bookmarks.remove, for example, since repeated removals
 // of the same item will actually have a different ID each time.
 template <class FunctionType>
 class BookmarkIdMapper : public BookmarkBucketMapper<int64> {
@@ skipping 169 matching lines @@
 bool BookmarksImportFunction::RunOnReady() {
   if (!EditBookmarksEnabled())
     return false;
   SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE);
   return true;
 }
 
 void BookmarksImportFunction::FileSelected(const base::FilePath& path,
                                            int index,
                                            void* params) {
-#if !defined(OS_ANDROID)
-  // Android does not have support for the standard importers.
-  // TODO(jgreenwald): remove ifdef once extensions are no longer built on
-  // Android.
   // Deletes itself.
   ExternalProcessImporterHost* importer_host = new ExternalProcessImporterHost;
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE;
   source_profile.source_path = path;
   importer_host->StartImportSettings(source_profile,
                                      GetProfile(),
                                      importer::FAVORITES,
                                      new ProfileWriter(GetProfile()));
 
   importer::LogImporterUseToMetrics("BookmarksAPI",
                                     importer::TYPE_BOOKMARKS_FILE);
-#endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 
 bool BookmarksExportFunction::RunOnReady() {
   SelectFile(ui::SelectFileDialog::SELECT_SAVEAS_FILE);
   return true;
 }
 
 void BookmarksExportFunction::FileSelected(const base::FilePath& path,
                                            int index,
                                            void* params) {
-#if !defined(OS_ANDROID)
-  // Android does not have support for the standard exporter.
   // TODO(jgreenwald): remove ifdef once extensions are no longer built on
   // Android.
   bookmark_html_writer::WriteBookmarks(GetProfile(), path, NULL);
-#endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 
 }  // namespace extensions