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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "base/test/histogram_tester.h" 14 #include "base/test/histogram_tester.h"
16 #include "build/build_config.h" 15 #include "build/build_config.h"
17 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/extensions/extension_browsertest.h" 17 #include "chrome/browser/extensions/extension_browsertest.h"
19 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/extension_util.h" 19 #include "chrome/browser/extensions/extension_util.h"
21 #include "chrome/browser/extensions/launch_util.h" 20 #include "chrome/browser/extensions/launch_util.h"
22 #include "chrome/browser/first_run/first_run.h" 21 #include "chrome/browser/first_run/first_run.h"
23 #include "chrome/browser/infobars/infobar_service.h" 22 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 14 matching lines...) Expand all
38 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" 37 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
39 #include "chrome/browser/ui/tabs/tab_strip_model.h" 38 #include "chrome/browser/ui/tabs/tab_strip_model.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/extensions/extension_constants.h" 40 #include "chrome/common/extensions/extension_constants.h"
42 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
43 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
44 #include "chrome/test/base/in_process_browser_test.h" 43 #include "chrome/test/base/in_process_browser_test.h"
45 #include "chrome/test/base/test_switches.h" 44 #include "chrome/test/base/test_switches.h"
46 #include "chrome/test/base/ui_test_utils.h" 45 #include "chrome/test/base/ui_test_utils.h"
47 #include "components/metrics/metrics_pref_names.h" 46 #include "components/metrics/metrics_pref_names.h"
47 #include "components/prefs/pref_service.h"
48 #include "content/public/browser/web_contents.h" 48 #include "content/public/browser/web_contents.h"
49 #include "content/public/common/content_switches.h" 49 #include "content/public/common/content_switches.h"
50 #include "content/public/test/test_utils.h" 50 #include "content/public/test/test_utils.h"
51 #include "extensions/browser/extension_system.h" 51 #include "extensions/browser/extension_system.h"
52 #include "net/test/embedded_test_server/embedded_test_server.h" 52 #include "net/test/embedded_test_server/embedded_test_server.h"
53 #include "testing/gtest/include/gtest/gtest.h" 53 #include "testing/gtest/include/gtest/gtest.h"
54 #include "url/gurl.h" 54 #include "url/gurl.h"
55 55
56 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 56 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
57 #include "base/callback.h" 57 #include "base/callback.h"
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 ASSERT_EQ(1, tab_strip->count()); 1716 ASSERT_EQ(1, tab_strip->count());
1717 EXPECT_EQ("title1.html", 1717 EXPECT_EQ("title1.html",
1718 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); 1718 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
1719 } 1719 }
1720 #endif // defined(ENABLE_CONFIGURATION_POLICY) 1720 #endif // defined(ENABLE_CONFIGURATION_POLICY)
1721 1721
1722 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || 1722 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) ||
1723 // defined(ENABLE_CONFIGURATION_POLICY) 1723 // defined(ENABLE_CONFIGURATION_POLICY)
1724 1724
1725 #endif // !defined(OS_CHROMEOS) 1725 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698