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

Side by Side Diff: chrome/browser/profiles/profile_browsertest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // (see crbug.com/88586). 86 // (see crbug.com/88586).
87 content::RunAllPendingInMessageLoop(); 87 content::RunAllPendingInMessageLoop();
88 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); 88 content::RunAllPendingInMessageLoop(content::BrowserThread::DB);
89 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE); 89 content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
90 } 90 }
91 91
92 } // namespace 92 } // namespace
93 93
94 class ProfileBrowserTest : public InProcessBrowserTest { 94 class ProfileBrowserTest : public InProcessBrowserTest {
95 protected: 95 protected:
96 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 96 virtual void SetUpCommandLine(CommandLine* command_line) override {
97 #if defined(OS_CHROMEOS) 97 #if defined(OS_CHROMEOS)
98 command_line->AppendSwitch( 98 command_line->AppendSwitch(
99 chromeos::switches::kIgnoreUserProfileMappingForTests); 99 chromeos::switches::kIgnoreUserProfileMappingForTests);
100 #endif 100 #endif
101 } 101 }
102 102
103 scoped_ptr<Profile> CreateProfile( 103 scoped_ptr<Profile> CreateProfile(
104 const base::FilePath& path, 104 const base::FilePath& path,
105 Profile::Delegate* delegate, 105 Profile::Delegate* delegate,
106 Profile::CreateMode create_mode) { 106 Profile::CreateMode create_mode) {
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 454 }
455 455
456 // Release the IO thread thread. 456 // Release the IO thread thread.
457 unblock->Signal(); 457 unblock->Signal();
458 } 458 }
459 459
460 ASSERT_TRUE(mis_wrote); 460 ASSERT_TRUE(mis_wrote);
461 } 461 }
462 462
463 #endif // defined(USE_X11) || defined(OS_WIN) 463 #endif // defined(USE_X11) || defined(OS_WIN)
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_avatar_icon_util.cc ('k') | chrome/browser/profiles/profile_destroyer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698