Revert 270232 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/themes/browser_theme_pack_unittest.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 "chrome/browser/themes/browser_theme_pack.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 451 matching lines @@
   EXPECT_EQ(0, out_val);
 }
 
 TEST_F(BrowserThemePackTest, CanParsePaths) {
   std::string path_json = "{ \"theme_button_background\": \"one\", "
                           "  \"theme_toolbar\": \"two\" }";
   TestFilePathMap out_file_paths;
   ParseImageNamesJSON(path_json, &out_file_paths);
 
   size_t expected_file_paths = 2u;
-#if defined(USE_ASH) && !defined(OS_CHROMEOS)
-  // On desktop builds with ash, additional theme paths are generated to map to
-  // the special resource ids like IDR_THEME_FRAME_DESKTOP, etc
+#if defined(OS_WIN)
+  // On Windows additional theme paths are generated to map to the special
+  // resource ids like IDR_THEME_FRAME_WIN, etc
   expected_file_paths = 3u;
 #endif
   EXPECT_EQ(expected_file_paths, out_file_paths.size());
   // "12" and "5" are internal constants to BrowserThemePack and are
   // PRS_THEME_BUTTON_BACKGROUND and PRS_THEME_TOOLBAR, but they are
   // implementation details that shouldn't be exported.
   // By default the scale factor is for 100%.
   EXPECT_TRUE(base::FilePath(FILE_PATH_LITERAL("one")) ==
               out_file_paths[12][ui::SCALE_FACTOR_100P]);
   EXPECT_TRUE(base::FilePath(FILE_PATH_LITERAL("two")) ==
@@ skipping 119 matching lines @@
   }
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(file, "gllekhaobjnhgeag");
     ASSERT_TRUE(pack.get());
     VerifyHiDpiTheme(pack.get());
   }
 }