Rename chrome/test/data/{osdd_new => osdd}

Bug: 739331
Change-Id: Ia60b65791b4d64241672e51d2a7cd39ab305e8eb
Reviewed-on: https://chromium-review.googlesource.com/620665
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#497002}

.gitignore

@@ -132,7 +132,6 @@ vs-chromium-project.txt
 /chrome/test/data/gpu/vectortown_endurance/
 /chrome/test/data/gpu/vt/
 /chrome/test/data/layout_tests
-/chrome/test/data/osdd
 /chrome/test/data/pdf_private
 /chrome/test/data/perf/canvas_bench
 /chrome/test/data/perf/frame_rate/content

chrome/browser/search_engines/template_url_parser_unittest.cc

@@ -76,10 +76,7 @@ TemplateURLParserTest::~TemplateURLParserTest() {
 
 void TemplateURLParserTest::SetUp() {
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &osdd_dir_));
-  // TODO(https://crbug.com/739331): Rename the path to "osdd" after most
-  // developers have synced over the removal of the old osdd directory from the
-  // internal repository.
-  osdd_dir_ = osdd_dir_.AppendASCII("osdd_new");
+  osdd_dir_ = osdd_dir_.AppendASCII("osdd");
   ASSERT_TRUE(base::PathExists(osdd_dir_));
 }