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

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

Issue 99333002: Revert of Move ConfigurationPolicyProvider, etc. to components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/test/base/ui_test_utils.h" 42 #include "chrome/test/base/ui_test_utils.h"
43 #include "content/public/browser/web_contents.h" 43 #include "content/public/browser/web_contents.h"
44 #include "testing/gtest/include/gtest/gtest.h" 44 #include "testing/gtest/include/gtest/gtest.h"
45 #include "url/gurl.h" 45 #include "url/gurl.h"
46 46
47 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 47 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
48 #include "base/callback.h" 48 #include "base/callback.h"
49 #include "base/run_loop.h" 49 #include "base/run_loop.h"
50 #include "base/values.h" 50 #include "base/values.h"
51 #include "chrome/browser/policy/browser_policy_connector.h" 51 #include "chrome/browser/policy/browser_policy_connector.h"
52 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
52 #include "components/policy/core/common/external_data_fetcher.h" 53 #include "components/policy/core/common/external_data_fetcher.h"
53 #include "components/policy/core/common/mock_configuration_policy_provider.h"
54 #include "components/policy/core/common/policy_map.h" 54 #include "components/policy/core/common/policy_map.h"
55 #include "components/policy/core/common/policy_types.h" 55 #include "components/policy/core/common/policy_types.h"
56 #include "policy/policy_constants.h" 56 #include "policy/policy_constants.h"
57 #include "testing/gmock/include/gmock/gmock.h" 57 #include "testing/gmock/include/gmock/gmock.h"
58 58
59 using testing::_; 59 using testing::_;
60 using testing::Return; 60 using testing::Return;
61 #endif // defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 61 #endif // defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
62 62
63 using extensions::Extension; 63 using extensions::Extension;
(...skipping 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 ASSERT_EQ(1, tab_strip->count()); 1402 ASSERT_EQ(1, tab_strip->count());
1403 EXPECT_EQ("title1.html", 1403 EXPECT_EQ("title1.html",
1404 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName()); 1404 tab_strip->GetWebContentsAt(0)->GetURL().ExtractFileName());
1405 } 1405 }
1406 #endif // defined(ENABLE_CONFIGURATION_POLICY) 1406 #endif // defined(ENABLE_CONFIGURATION_POLICY)
1407 1407
1408 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) || 1408 #endif // !defined(OS_LINUX) || !defined(GOOGLE_CHROME_BUILD) ||
1409 // defined(ENABLE_CONFIGURATION_POLICY) 1409 // defined(ENABLE_CONFIGURATION_POLICY)
1410 1410
1411 #endif // !defined(OS_CHROMEOS) 1411 #endif // !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698