Make default location of checked in images match the checked in images.

chrome/test/gpu/gpu_pixel_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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 95 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     test_data_dir_ = test_data_dir_.AppendASCII("gpu");
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(kGeneratedDir))
       generated_img_dir_ = command_line->GetSwitchValuePath(kGeneratedDir);
     else
       generated_img_dir_ = test_data_dir_.AppendASCII("generated");
     if (command_line->HasSwitch(kReferenceDir))
       ref_img_dir_ = command_line->GetSwitchValuePath(kReferenceDir);
+    else if (!command_line->HasSwitch(switches::kUseGpuInTests))
+      ref_img_dir_ = test_data_dir_.AppendASCII("llvmpipe_reference");
     else
       ref_img_dir_ = test_data_dir_.AppendASCII("gpu_reference");
 
     // Only use checked in ref images when using a software rasterizer as
     // all machines should generate the same output with a software rasterizer.
     use_checked_in_ref_imgs_ = !command_line->HasSwitch(
         switches::kUseGpuInTests);
 
     test_name_ = testing::UnitTest::GetInstance()->current_test_info()->name();
     const char* test_status_prefixes[] = {"DISABLED_", "FLAKY_", "FAILS_"};
@@ skipping 363 matching lines @@
 IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, Canvas2DRedBoxSD) {
   // If test baseline needs to be updated after a given revision, update the
   // following number. If no revision requirement, then 0.
   const int64 ref_img_revision_update = 123489;
 
   gfx::Size container_size(400, 300);
   FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update);
 }