Update pdf browser tests to use test data from new location.

chrome/browser/ui/pdf/pdf_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/hash.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 33 matching lines @@
 class PDFBrowserTest : public InProcessBrowserTest,
                        public testing::WithParamInterface<int>,
                        public content::NotificationObserver {
  public:
   PDFBrowserTest()
       : snapshot_different_(true),
         next_dummy_search_value_(0),
         load_stop_notification_count_(0) {
     base::FilePath src_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
-    pdf_test_server_.ServeFilesFromDirectory(src_dir.AppendASCII("pdf/test"));
+    pdf_test_server_.ServeFilesFromDirectory(src_dir.AppendASCII(
+        "chrome/test/data/pdf_private"));
   }
 
  protected:
   // Use our own TestServer so that we can serve files from the pdf directory.
   net::test_server::EmbeddedTestServer* pdf_test_server() {
     return &pdf_test_server_;
   }
 
   int load_stop_notification_count() const {
     return load_stop_notification_count_;
   }
 
-  base::FilePath GetPDFTestDir() {
-    return base::FilePath(base::FilePath::kCurrentDirectory).AppendASCII("..").
-        AppendASCII("..").AppendASCII("..").AppendASCII("pdf").
-        AppendASCII("test");
-  }
-
   void Load() {
     // Make sure to set the window size before rendering, as otherwise rendering
     // to a smaller window and then expanding leads to slight anti-aliasing
     // differences of the text and the pixel comparison fails.
     gfx::Rect bounds(gfx::Rect(0, 0, kBrowserWidth, kBrowserHeight));
     gfx::Rect screen_bounds =
         gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds();
     ASSERT_GT(screen_bounds.width(), kBrowserWidth);
     ASSERT_GT(screen_bounds.height(), kBrowserHeight);
     browser()->window()->SetBounds(bounds);
 
     GURL url(ui_test_utils::GetTestUrl(
-        GetPDFTestDir(),
+        base::FilePath(FILE_PATH_LITERAL("pdf_private")),
         base::FilePath(FILE_PATH_LITERAL("pdf_browsertest.pdf"))));
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
   bool VerifySnapshot(const std::string& expected_filename) {
     snapshot_different_ = true;
     expected_filename_ = expected_filename;
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     DCHECK(web_contents);
@@ skipping 30 matching lines @@
     ASSERT_EQ(0, ui_test_utils::FindInPage(
         browser()->tab_strip_model()->GetActiveWebContents(),
         query, true, false, NULL, NULL));
   }
 
  private:
   void CopyFromBackingStoreCallback(bool success, const SkBitmap& bitmap) {
     base::MessageLoopForUI::current()->Quit();
     ASSERT_EQ(success, true);
     base::FilePath reference = ui_test_utils::GetTestFilePath(
-        GetPDFTestDir(),
+        base::FilePath(FILE_PATH_LITERAL("pdf_private")),
         base::FilePath().AppendASCII(expected_filename_));
     base::File::Info info;
     ASSERT_TRUE(base::GetFileInfo(reference, &info));
     int size = static_cast<size_t>(info.size);
     scoped_ptr<char[]> data(new char[size]);
     ASSERT_EQ(size, base::ReadFile(reference, data.get(), size));
 
     int w, h;
     std::vector<unsigned char> decoded;
     ASSERT_TRUE(gfx::PNGCodec::Decode(
@@ skipping 165 matching lines @@
 
   NavigationController* controller =
       &(browser()->tab_strip_model()->GetActiveWebContents()->GetController());
   content::NotificationRegistrar registrar;
   registrar.Add(this,
                 content::NOTIFICATION_LOAD_STOP,
                 content::Source<NavigationController>(controller));
   std::string base_url = std::string("/");
 
   base::FileEnumerator file_enumerator(
-      ui_test_utils::GetTestFilePath(GetPDFTestDir(), base::FilePath()),
+      ui_test_utils::GetTestFilePath(
+          base::FilePath(FILE_PATH_LITERAL("pdf_private")), base::FilePath()),
       false,
       base::FileEnumerator::FILES,
       FILE_PATH_LITERAL("*.pdf"));
   for (base::FilePath file_path = file_enumerator.Next();
        !file_path.empty();
        file_path = file_enumerator.Next()) {
     std::string filename = file_path.BaseName().MaybeAsASCII();
     ASSERT_FALSE(filename.empty());
 
 #if defined(OS_POSIX)
@@ skipping 88 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents(),
       "reloadPDF();"));
   observer.Wait();
 
   ASSERT_EQ("success",
             browser()->tab_strip_model()->GetActiveWebContents()->
                 GetURL().query());
 }
 
 }  // namespace