[Android] Remove enhanced bookmark grid view.

BUG=499415

Review URL: https://codereview.chromium.org/1192433009

Cr-Commit-Position: refs/heads/master@{#335629}

4 files changed, 0 insertions, 37 deletions

diff --git a/components/enhanced_bookmarks/BUILD.gn b/components/enhanced_bookmarks/BUILD.gn
index d4fcc2a..7702fbd 100644
--- a/components/enhanced_bookmarks/BUILD.gn
+++ b/components/enhanced_bookmarks/BUILD.gn
@@ -64,7 +64,6 @@ if (is_android) {
     ]
     outputs = [
       "org/chromium/chrome/browser/enhanced_bookmarks/LaunchLocation.java",
-      "org/chromium/chrome/browser/enhanced_bookmarks/ViewMode.java",
     ]
   }
 }
diff --git a/components/enhanced_bookmarks/DEPS b/components/enhanced_bookmarks/DEPS
index 1a3fa5a..114b12c 100644
--- a/components/enhanced_bookmarks/DEPS
+++ b/components/enhanced_bookmarks/DEPS
@@ -4,7 +4,6 @@ include_rules = [
   "+components/pref_registry",
   "+components/signin",
   "+components/sync_driver",
-  "+components/variations",
   "+google_apis/gaia",
   "+jni",
   "+net",
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.cc b/components/enhanced_bookmarks/enhanced_bookmark_utils.cc
index 7108d98..1ca96ca 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_utils.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.cc
@@ -5,15 +5,12 @@
 #include "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/variations/variations_associated_data.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace enhanced_bookmarks {
 
-const char kFieldTrialName[] = "EnhancedBookmarks";
-
 std::vector<const BookmarkNode*> PrimaryPermanentNodes(BookmarkModel* model) {
   DCHECK(model->loaded());
   std::vector<const BookmarkNode*> nodes;
@@ -66,19 +63,4 @@ const BookmarkNode* RootLevelFolderForNode(const BookmarkNode* node,
   return top;
 }
 
-ViewMode GetDefaultViewMode() {
-  std::string default_view_mode = variations::GetVariationParamValue(
-      enhanced_bookmarks::kFieldTrialName, "DefaultViewMode");
-
-  if (default_view_mode == "List") {
-    return ViewMode::LIST;
-  } else if (default_view_mode == "Grid") {
-    return ViewMode::GRID;
-  }
-
-  // If finch data is not available or has an invalid value, we fall back to
-  // ViewMode::GRID.
-  return ViewMode::GRID;
-}
-
 }  // namespace enhanced_bookmarks
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_utils.h b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
index 81476eb..c66fa9a 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_utils.h
+++ b/components/enhanced_bookmarks/enhanced_bookmark_utils.h
@@ -16,8 +16,6 @@ class BookmarkNode;
 
 namespace enhanced_bookmarks {
 
-extern const char kFieldTrialName[];
-
 // Possible locations where a bookmark can be opened from.
 // Please sync with the corresponding histograms.xml.
 //
@@ -33,16 +31,6 @@ enum LaunchLocation {
   COUNT = 6,
 };
 
-// View modes of enhanced bookmarks' main items UI.
-//
-// A Java counterpart will be generated for this enum.
-// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.enhanced_bookmarks
-enum ViewMode {
-  DEFAULT = 0,
-  LIST = 1,
-  GRID = 2,
-};
-
 // Returns the permanent nodes whose url children are considered uncategorized
 // and whose folder children should be shown in the bookmark menu.
 // |model| must be loaded.
@@ -66,11 +54,6 @@ const bookmarks::BookmarkNode* RootLevelFolderForNode(
     const bookmarks::BookmarkNode* node,
     bookmarks::BookmarkModel* model);
 
-// Returns the default view mode for main items UI.
-// The default is controlled by a finch experiment. If finch is not available or
-// has an invalid value, it returns a hard coded default view mode.
-ViewMode GetDefaultViewMode();
-
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_UTILS_H_