Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3138)

Unified Diff: chrome/browser/chrome_browser_main_mac_browsertest.mm

Issue 2209363002: Remove material design resource pak infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove another mac test file Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_mac_browsertest.mm
diff --git a/chrome/browser/chrome_browser_main_mac_browsertest.mm b/chrome/browser/chrome_browser_main_mac_browsertest.mm
deleted file mode 100644
index 13a7a62872b369a12fbcbb14b21a553c36c88cdf..0000000000000000000000000000000000000000
--- a/chrome/browser/chrome_browser_main_mac_browsertest.mm
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2016 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 "chrome/test/base/in_process_browser_test.h"
-#include "content/public/test/test_utils.h"
-#import "testing/gtest_mac.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/resource/resource_handle.h"
-#include "ui/base/resource/scale_factor.h"
-#include "ui/base/ui_base_switches.h"
-
-namespace ui {
-
-class ChromeBrowserMainMacBrowserTest : public InProcessBrowserTest {
- public:
- ChromeBrowserMainMacBrowserTest() {}
-
- protected:
- void SetUpCommandLine(base::CommandLine* command_line) override {
- // Activate Material Design mode by placing the MD switch on the command
- // line.
- command_line->AppendSwitchASCII(switches::kTopChromeMD,
- switches::kTopChromeMDMaterial);
- }
-};
-
-// Confirm that the Material Design resource packs are loaded and are the
-// first packs in the vector (so that they are searched before the regular non-
-// MD packs). TODO(shrike) - remove this test once Material Design replaces
-// the old design.
-IN_PROC_BROWSER_TEST_F(ChromeBrowserMainMacBrowserTest, MDResourceAccess) {
- // Make sure we're running in Material Design mode.
- ASSERT_TRUE(MaterialDesignController::IsModeMaterial());
-
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- int counter = 0;
- for (const auto& pack : rb.data_packs_) {
- switch (counter) {
- case 0:
- // The first pack should be Material Design at 1x.
- EXPECT_TRUE(pack->HasOnlyMaterialDesignAssets());
- EXPECT_EQ(SCALE_FACTOR_100P, pack->GetScaleFactor());
- break;
-
- case 1:
- // The Second pack should be Material Design at 2x.
- EXPECT_TRUE(pack->HasOnlyMaterialDesignAssets());
- EXPECT_EQ(SCALE_FACTOR_200P, pack->GetScaleFactor());
- break;
-
- default:
- // All other packs should not be Material Design.
- EXPECT_FALSE(pack->HasOnlyMaterialDesignAssets());
- break;
- }
- counter++;
- }
-}
-
-} // namespace ui
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698