Clean up dead code related to enhanced_bookmarks.

This deletes the last bit of components/enhanced_bookmarks (by moving
the enum into chrome/android/java, the only place where it's used),
and cleans up dead code related to enhanced bookmarks.

BUG=474719

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

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

11 files changed, 29 insertions, 15 deletions

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d0e5227..0b12617 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -178,7 +178,6 @@ android_library("chrome_java") {
     srcjar_deps += [
       ":custom_tabs_service_aidl",
       "//chrome:page_info_connection_type_javagen",
-      "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
       "//components/infobars/core:infobar_enums_java",
       "//components/offline_pages:offline_page_feature_enums_java",
       "//components/offline_pages:offline_page_model_enums_java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/BookmarkLaunchLocation.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/BookmarkLaunchLocation.java
new file mode 100644
index 0000000..4fb3e18
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/BookmarkLaunchLocation.java
@@ -0,0 +1,20 @@
+// Copyright 2016 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.
+
+package org.chromium.chrome.browser.enhancedbookmarks;
+
+/**
+ * Possible locations from which a bookmark can be opened.
+ *
+ * Please sync with the corresponding histograms.xml.
+ */
+class BookmarkLaunchLocation {
+    public static final int ALL_ITEMS = 0;
+    public static final int UNCATEGORIZED = 1;  // Deprecated.
+    public static final int FOLDER = 2;
+    public static final int FILTER = 3;
+    public static final int SEARCH = 4;
+    public static final int BOOKMARK_EDITOR = 5;
+    public static final int COUNT = 6;
+}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java
index 5912934..ef7dcbc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java
@@ -83,7 +83,7 @@ public class EnhancedBookmarkActivity extends EnhancedBookmarkActivityBase imple
         if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
             BookmarkId bookmarkId = BookmarkId.getBookmarkIdFromString(data.getStringExtra(
                     INTENT_VISIT_BOOKMARK_ID));
-            mBookmarkManager.openBookmark(bookmarkId, LaunchLocation.BOOKMARK_EDITOR);
+            mBookmarkManager.openBookmark(bookmarkId, BookmarkLaunchLocation.BOOKMARK_EDITOR);
         }
     }
 }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java
index 5011497..e54599b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkBookmarkRow.java
@@ -60,13 +60,13 @@ public class EnhancedBookmarkBookmarkRow extends EnhancedBookmarkRow implements
         int launchLocation = -1;
         switch (mDelegate.getCurrentState()) {
             case EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS:
-                launchLocation = LaunchLocation.ALL_ITEMS;
+                launchLocation = BookmarkLaunchLocation.ALL_ITEMS;
                 break;
             case EnhancedBookmarkUIState.STATE_FOLDER:
-                launchLocation = LaunchLocation.FOLDER;
+                launchLocation = BookmarkLaunchLocation.FOLDER;
                 break;
             case EnhancedBookmarkUIState.STATE_FILTER:
-                launchLocation = LaunchLocation.FILTER;
+                launchLocation = BookmarkLaunchLocation.FILTER;
                 break;
             case EnhancedBookmarkUIState.STATE_LOADING:
                 assert false :
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java
index 681c0fa..fcdcf45 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java
@@ -107,7 +107,7 @@ interface EnhancedBookmarkDelegate {
      * Closes the EnhancedBookmark UI (if on phone) and opens the given bookmark.
      * @param bookmark       bookmark to open.
      * @param launchLocation The UI location where user tried to open bookmark. It is one of
-     *                       {@link LaunchLocation} values
+     *                       {@link BookmarkLaunchLocation} values
      */
     void openBookmark(BookmarkId bookmark, int launchLocation);
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
index c70e260..94471c1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkEditActivity.java
@@ -345,7 +345,7 @@ public class EnhancedBookmarkEditActivity extends EnhancedBookmarkActivityBase {
             setResult(RESULT_OK, intent);
         } else {
             EnhancedBookmarkUtils.openBookmark(
-                    mModel, this, mBookmarkId, LaunchLocation.BOOKMARK_EDITOR);
+                    mModel, this, mBookmarkId, BookmarkLaunchLocation.BOOKMARK_EDITOR);
         }
         finish();
     }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
index e60e08d..fe5eb9f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkSearchRow.java
@@ -54,7 +54,7 @@ public class EnhancedBookmarkSearchRow extends EnhancedBookmarkBookmarkRow {
 
     @Override
     public void onClick() {
-        mDelegate.openBookmark(mBookmarkId, LaunchLocation.SEARCH);
+        mDelegate.openBookmark(mBookmarkId, BookmarkLaunchLocation.SEARCH);
         mHistoryDelegate.saveSearchHistory();
     }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
index 405a9fa..25b4442 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java
@@ -418,10 +418,10 @@ public class EnhancedBookmarkUtils {
         NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_BOOKMARK);
         if (url.startsWith("file:")) {
             RecordHistogram.recordEnumeratedHistogram(
-                    "OfflinePages.LaunchLocation", launchLocation, LaunchLocation.COUNT);
+                    "OfflinePages.LaunchLocation", launchLocation, BookmarkLaunchLocation.COUNT);
         } else {
             RecordHistogram.recordEnumeratedHistogram(
-                    "Stars.LaunchLocation", launchLocation, LaunchLocation.COUNT);
+                    "Stars.LaunchLocation", launchLocation, BookmarkLaunchLocation.COUNT);
         }
 
         openUrl(activity, url);
diff --git a/chrome/browser/bookmarks/OWNERS b/chrome/browser/bookmarks/OWNERS
index 5d70523..90b3e80 100644
--- a/chrome/browser/bookmarks/OWNERS
+++ b/chrome/browser/bookmarks/OWNERS
@@ -1,3 +1 @@
 sky@chromium.org
-
-per-file enhanced_bookmarks_features*=wittman@chromium.org
\ No newline at end of file
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 88707ca..80001ca 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -556,7 +556,6 @@
             '../components/components.gyp:autocomplete_match_type_java',
             '../components/components.gyp:bookmarks_java',
             '../components/components.gyp:dom_distiller_core_java',
-            '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar',
             '../components/components.gyp:gcm_driver_java',
             '../components/components.gyp:infobar_delegate_java',
             '../components/components.gyp:invalidation_java',
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 44ea1e5..95b5784 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -192,8 +192,6 @@ extern const char kLoadExtension[];
 extern const char kLocalNtpReload[];
 #endif
 extern const char kMakeDefaultBrowser[];
-extern const char kManualEnhancedBookmarks[];
-extern const char kManualEnhancedBookmarksOptout[];
 extern const char kMediaCacheSize[];
 extern const char kMediaRouter[];
 extern const char kMessageLoopHistogrammer[];