Remove stale mentions of mandoline.

BUG=NONE

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

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

8 files changed, 12 insertions, 85 deletions

diff --git a/.gn b/.gn
index e32288d..5f68f60 100644
--- a/.gn
+++ b/.gn
@@ -57,7 +57,6 @@ check_targets = [
   "//ipc/*",
 
   #"//jingle/*",
-  "//mandoline/*",
   "//mash/*",
 
   #"//media/*",  # Lots of errors.
diff --git a/WATCHLISTS b/WATCHLISTS
index f4bf35f..93f9b74 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -476,9 +476,6 @@
     'linux_seccomp_bpf': {
       'filepath': 'content/common/sandbox.*linux.cc',
     },
-    'mandoline': {
-      'filepath': 'mandoline',
-    },
     'manifest': {
       'filepath': 'content/(browser|renderer)/manifest/'\
                   '|content/public/common/manifest*',
@@ -1405,9 +1402,6 @@
     'linux_sandboxing': ['jln+watch@chromium.org'],
     'linux_seccomp_bpf': ['jln+watch@chromium.org'],
     'supervised_users': ['pam+watch@chromium.org'],
-    'mandoline': ['yzshen+watch@chromium.org',
-                  'penghuang+watch-mandoline@chromium.org',
-                  'rjkroege@chromium.org'],
     'manifest': ['mlamouri+watch-manifest@chromium.org'],
     'md_settings': ['dbeam+watch-settings@chromium.org',
                     'michaelpg+watch-md-settings@chromium.org',
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 011f74d..9fe694c 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -65,23 +65,19 @@ base::FilePath FileSystemApp::GetUserDataDir() {
   } else {
 #if defined(OS_WIN)
     CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path));
-    path = path.Append(FILE_PATH_LITERAL("mandoline"));
-#elif defined(OS_LINUX)
-    scoped_ptr<base::Environment> env(base::Environment::Create());
-    base::FilePath config_dir(
-        base::nix::GetXDGDirectory(env.get(),
-                                   base::nix::kXdgConfigHomeEnvVar,
-                                   base::nix::kDotConfigDir));
-    path = config_dir.Append("mandoline");
 #elif defined(OS_MACOSX)
     CHECK(PathService::Get(base::DIR_APP_DATA, &path));
-    path = path.Append("Mandoline Shell");
 #elif defined(OS_ANDROID)
     CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
-    path = path.Append(FILE_PATH_LITERAL("mandoline"));
+#elif defined(OS_LINUX)
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    path = base::nix::GetXDGDirectory(env.get(),
+                                      base::nix::kXdgConfigHomeEnvVar,
+                                      base::nix::kDotConfigDir);
 #else
     NOTIMPLEMENTED();
 #endif
+    path = path.Append(FILE_PATH_LITERAL("filesystem"));
   }
 
   if (!base::PathExists(path))
diff --git a/components/url_formatter/DEPS b/components/url_formatter/DEPS
index 3c1754f..b2c9606 100644
--- a/components/url_formatter/DEPS
+++ b/components/url_formatter/DEPS
@@ -1,10 +1,9 @@
 include_rules = [
-  # This is a shared component (Mandoline, iOS, content), and as such, MUST NOT
-  # depend on content or other components that do.
+  # This is a shared component (iOS, content), and as such, MUST NOT depend on
+  #  content or other components that do.
   "-components/html_viewer",
   "-content",
   "-ios",
-  "-mandoline",
 
   "+net",
   "+ui/gfx",
diff --git a/media/mojo/scripts/run_mojo_media_renderer.py b/media/mojo/scripts/run_mojo_media_renderer.py
deleted file mode 100755
index d963e9a..0000000
--- a/media/mojo/scripts/run_mojo_media_renderer.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2015 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.
-#
-# The script launches mandoline to test the mojo media renderer.
-
-import argparse
-import os
-import subprocess
-import sys
-
-
-root_path = os.path.realpath(
-    os.path.join(
-        os.path.dirname(
-            os.path.realpath(__file__)),
-        os.pardir,
-        os.pardir,
-        os.pardir))
-
-
-def _BuildCommand(args):
-  build_dir = os.path.join(root_path, args.build_dir)
-
-  runner = [os.path.join(build_dir, "mandoline")]
-
-  options = ["--enable-mojo-media-renderer"]
-  if args.verbose:
-    options.append("--vmodule=pipeline*=3,*renderer_impl*=3,"
-                   "*mojo_demuxer*=3,mojo*service=3")
-
-  full_command = runner + options + [args.url]
-
-  if args.verbose:
-    print full_command
-
-  return full_command
-
-
-def main():
-  parser = argparse.ArgumentParser(
-      description="View a URL with Mandoline with mojo media renderer. "
-                  "You must have built //mandoline, //components/html_viewer, "
-                  "//mojo, //mojo/services/network and //media/mojo/services "
-                  "first.")
-  parser.add_argument(
-      "--build-dir",
-      help="Path to the dir containing the linux-x64 binaries relative to the "
-           "repo root (default: %(default)s)",
-      default="out/Release")
-  parser.add_argument("--verbose", help="Increase output verbosity.",
-                      action="store_true")
-  parser.add_argument("url", help="The URL to be viewed")
-
-  args = parser.parse_args()
-  return subprocess.call(_BuildCommand(args))
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/tools/perf/benchmarks/page_cycler.py b/tools/perf/benchmarks/page_cycler.py
index c23ae72..c6d3764 100644
--- a/tools/perf/benchmarks/page_cycler.py
+++ b/tools/perf/benchmarks/page_cycler.py
@@ -216,8 +216,7 @@ class PageCyclerToughLayoutCases(_PageCycler):
 
 
 # crbug.com/273986: This test is flakey on Windows Chrome.
-@benchmark.Enabled('android', 'chromeos', 'linux', 'ios', 'mac',
-                   'mandoline-release', 'mandoline-debug')
+@benchmark.Enabled('android', 'chromeos', 'linux', 'ios', 'mac')
 class PageCyclerTypical25(_PageCycler):
   """Page load time benchmark for a 25 typical web pages.
 
diff --git a/tools/perf/benchmarks/startup.py b/tools/perf/benchmarks/startup.py
index 6ed3d0b..cb93e55 100644
--- a/tools/perf/benchmarks/startup.py
+++ b/tools/perf/benchmarks/startup.py
@@ -61,7 +61,7 @@ class StartupWarmBlankPage(_StartupWarm):
 
 @benchmark.Disabled('reference',                   # http://crbug.com/476882
                     'android',                     # http://crbug.com/481919
-                    'content-shell', 'mandoline')  # No pregenerated profiles.
+                    'content-shell')               # No pregenerated profiles.
 class StartupLargeProfileColdBlankPage(_StartupCold):
   """Measures cold startup time with a large profile."""
   tag = 'cold'
@@ -81,7 +81,7 @@ class StartupLargeProfileColdBlankPage(_StartupCold):
 
 @benchmark.Disabled('reference',                   # http://crbug.com/476882
                     'android',                     # http://crbug.com/481919
-                    'content-shell', 'mandoline')  # No pregenerated profiles.
+                    'content-shell')               # No pregenerated profiles.
 class StartupLargeProfileWarmBlankPage(_StartupWarm):
   """Measures warm startup time with a large profile."""
   tag = 'warm'
diff --git a/ui/views/mus/input_method_mus.cc b/ui/views/mus/input_method_mus.cc
index 3234f8f..cee5ea6 100644
--- a/ui/views/mus/input_method_mus.cc
+++ b/ui/views/mus/input_method_mus.cc
@@ -103,4 +103,4 @@ void InputMethodMUS::UpdateTextInputType() {
     window_->SetTextInputState(std::move(state));
 }
 
-}  // namespace mandoline
+}  // namespace views