Revert of Upstream Enhanced Bookmark Model

components/enhanced_bookmarks/BUILD.gn

 # Copyright 2014 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.
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 # GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks
@@ skipping 43 matching lines @@
   }
 }
 
 if (is_android) {
   # GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks_launch_location_srcjar
   java_cpp_enum("enhanced_bookmarks_launch_location_srcjar") {
     sources = [
       "enhanced_bookmark_utils.h",
     ]
     outputs = [
-      "org/chromium/chrome/browser/enhanced_bookmarks/LaunchLocation.java",
+      "org/chromium/chrome/browser/enhancedbookmark/LaunchLocation.java",
     ]
   }
 }
 
 # GYP: //components/enhanced_bookmarks.gypi:enhanced_bookmarks_test_support
 source_set("test_support") {
   testonly = true
   sources = [
     "test_image_store.cc",
     "test_image_store.h",
   ]
 
   deps = [
     ":enhanced_bookmarks",
     "//skia",
     "//testing/gtest",
   ]
 }