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

Side by Side Diff: chrome/browser/web_applications/web_app_unittest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/web_applications/web_app.h" 5 #include "chrome/browser/web_applications/web_app.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/web_applications/web_app.h" 10 #include "chrome/browser/web_applications/web_app.h"
11 #include "chrome/common/render_messages.h" 11 #include "chrome/common/render_messages.h"
12 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 12 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
13 #include "content/public/test/test_renderer_host.h" 13 #include "content/public/test/test_renderer_host.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 #if defined(TOOLKIT_VIEWS) 16 #if defined(TOOLKIT_VIEWS)
17 #include "chrome/browser/extensions/tab_helper.h" 17 #include "chrome/browser/extensions/tab_helper.h"
18 #include "chrome/browser/favicon/favicon_tab_helper.h" 18 #include "chrome/browser/favicon/favicon_tab_helper.h"
19 #endif 19 #endif
20 20
21 using content::RenderViewHostTester; 21 using content::RenderViewHostTester;
22 22
23 class WebApplicationTest : public ChromeRenderViewHostTestHarness { 23 class WebApplicationTest : public ChromeRenderViewHostTestHarness {
24 protected: 24 protected:
25 virtual void SetUp() OVERRIDE { 25 virtual void SetUp() override {
26 ChromeRenderViewHostTestHarness::SetUp(); 26 ChromeRenderViewHostTestHarness::SetUp();
27 #if defined(TOOLKIT_VIEWS) 27 #if defined(TOOLKIT_VIEWS)
28 extensions::TabHelper::CreateForWebContents(web_contents()); 28 extensions::TabHelper::CreateForWebContents(web_contents());
29 FaviconTabHelper::CreateForWebContents(web_contents()); 29 FaviconTabHelper::CreateForWebContents(web_contents());
30 #endif 30 #endif
31 } 31 }
32 }; 32 };
33 33
34 #if defined(TOOLKIT_VIEWS) 34 #if defined(TOOLKIT_VIEWS)
35 TEST_F(WebApplicationTest, GetShortcutInfoForTab) { 35 TEST_F(WebApplicationTest, GetShortcutInfoForTab) {
(...skipping 28 matching lines...) Expand all
64 64
65 TEST_F(WebApplicationTest, AppDirWithUrl) { 65 TEST_F(WebApplicationTest, AppDirWithUrl) {
66 base::FilePath profile_path(FILE_PATH_LITERAL("profile")); 66 base::FilePath profile_path(FILE_PATH_LITERAL("profile"));
67 base::FilePath result(web_app::GetWebAppDataDirectory( 67 base::FilePath result(web_app::GetWebAppDataDirectory(
68 profile_path, std::string(), GURL("http://example.com"))); 68 profile_path, std::string(), GURL("http://example.com")));
69 base::FilePath expected = profile_path.AppendASCII("Web Applications") 69 base::FilePath expected = profile_path.AppendASCII("Web Applications")
70 .AppendASCII("example.com").AppendASCII("http_80"); 70 .AppendASCII("example.com").AppendASCII("http_80");
71 EXPECT_EQ(expected, result); 71 EXPECT_EQ(expected, result);
72 } 72 }
73 #endif // ENABLE_EXTENSIONS 73 #endif // ENABLE_EXTENSIONS
OLDNEW
« no previous file with comments | « chrome/browser/upgrade_detector_impl_unittest.cc ('k') | chrome/browser/web_resource/eula_accepted_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698