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

Side by Side Diff: chrome/browser/translate/translate_browsertest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 }; // namespace 47 }; // namespace
48 48
49 class TranslateBrowserTest : public InProcessBrowserTest { 49 class TranslateBrowserTest : public InProcessBrowserTest {
50 public: 50 public:
51 TranslateBrowserTest() 51 TranslateBrowserTest()
52 : https_server_(net::SpawnedTestServer::TYPE_HTTPS, 52 : https_server_(net::SpawnedTestServer::TYPE_HTTPS,
53 SSLOptions(SSLOptions::CERT_OK), 53 SSLOptions(SSLOptions::CERT_OK),
54 base::FilePath(kTranslateRoot)), 54 base::FilePath(kTranslateRoot)),
55 infobar_service_(NULL) {} 55 infobar_service_(NULL) {}
56 56
57 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 57 virtual void SetUpCommandLine(CommandLine* command_line) override {
58 ASSERT_TRUE(https_server_.Start()); 58 ASSERT_TRUE(https_server_.Start());
59 // Setup alternate security origin for testing in order to allow XHR against 59 // Setup alternate security origin for testing in order to allow XHR against
60 // local test server. Note that this flag shows a confirm infobar in tests. 60 // local test server. Note that this flag shows a confirm infobar in tests.
61 GURL base_url = GetSecureURL(""); 61 GURL base_url = GetSecureURL("");
62 command_line->AppendSwitchASCII( 62 command_line->AppendSwitchASCII(
63 translate::switches::kTranslateSecurityOrigin, 63 translate::switches::kTranslateSecurityOrigin,
64 base_url.GetOrigin().spec()); 64 base_url.GetOrigin().spec());
65 } 65 }
66 66
67 protected: 67 protected:
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 GetNonSecureURL(kUpdateLocationAtOnloadTestPath)); 349 GetNonSecureURL(kUpdateLocationAtOnloadTestPath));
350 350
351 // Wait for the page title is changed after the test finished. 351 // Wait for the page title is changed after the test finished.
352 const base::string16 result = watcher.WaitAndGetTitle(); 352 const base::string16 result = watcher.WaitAndGetTitle();
353 EXPECT_EQ("PASS", base::UTF16ToASCII(result)); 353 EXPECT_EQ("PASS", base::UTF16ToASCII(result));
354 354
355 // Check if there is no Translate infobar. 355 // Check if there is no Translate infobar.
356 translate = GetExistingTranslateInfoBarDelegate(); 356 translate = GetExistingTranslateInfoBarDelegate();
357 EXPECT_FALSE(translate); 357 EXPECT_FALSE(translate);
358 } 358 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698