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

Side by Side Diff: chrome/browser/importer/firefox_importer_browsertest.cc

Issue 684613002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 bool use_keyword_in_json_; 237 bool use_keyword_in_json_;
238 }; 238 };
239 239
240 } // namespace 240 } // namespace
241 241
242 // These tests need to be browser tests in order to be able to run the OOP 242 // These tests need to be browser tests in order to be able to run the OOP
243 // import (via ExternalProcessImporterHost) which launches a utility process on 243 // import (via ExternalProcessImporterHost) which launches a utility process on
244 // supported platforms. 244 // supported platforms.
245 class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest { 245 class FirefoxProfileImporterBrowserTest : public InProcessBrowserTest {
246 protected: 246 protected:
247 virtual void SetUp() override { 247 void SetUp() override {
248 // Creates a new profile in a new subdirectory in the temp directory. 248 // Creates a new profile in a new subdirectory in the temp directory.
249 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 249 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
250 base::FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest"); 250 base::FilePath test_path = temp_dir_.path().AppendASCII("ImporterTest");
251 base::DeleteFile(test_path, true); 251 base::DeleteFile(test_path, true);
252 base::CreateDirectory(test_path); 252 base::CreateDirectory(test_path);
253 profile_path_ = test_path.AppendASCII("profile"); 253 profile_path_ = test_path.AppendASCII("profile");
254 app_path_ = test_path.AppendASCII("app"); 254 app_path_ = test_path.AppendASCII("app");
255 base::CreateDirectory(app_path_); 255 base::CreateDirectory(app_path_);
256 256
257 // This will launch the browser test and thus needs to happen last. 257 // This will launch the browser test and thus needs to happen last.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(false)); 326 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(false));
327 FirefoxImporterBrowserTest( 327 FirefoxImporterBrowserTest(
328 "firefox35_profile", observer.get(), observer.get()); 328 "firefox35_profile", observer.get(), observer.get());
329 } 329 }
330 330
331 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, 331 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
332 MAYBE_IMPORTER(FirefoxImporter)) { 332 MAYBE_IMPORTER(FirefoxImporter)) {
333 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true)); 333 scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true));
334 FirefoxImporterBrowserTest("firefox_profile", observer.get(), observer.get()); 334 FirefoxImporterBrowserTest("firefox_profile", observer.get(), observer.get());
335 } 335 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698