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

Side by Side Diff: chrome/browser/chromeos/extensions/default_app_order_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 4 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 | 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 "chrome/browser/chromeos/extensions/default_app_order.h" 5 #include "chrome/browser/chromeos/extensions/default_app_order.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/test/scoped_path_override.h" 15 #include "base/test/scoped_path_override.h"
16 #include "chrome/common/extensions/extension_constants.h" 16 #include "chrome/common/extensions/extension_constants.h"
17 #include "chromeos/chromeos_paths.h" 17 #include "chromeos/chromeos_paths.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 std::vector<std::string> apps; 140 std::vector<std::string> apps;
141 default_app_order::Get(&apps); 141 default_app_order::Get(&apps);
142 EXPECT_EQ(default_app_order::kDefaultAppOrderCount + 2, apps.size()); 142 EXPECT_EQ(default_app_order::kDefaultAppOrderCount + 2, apps.size());
143 EXPECT_EQ(std::string("app1"), apps[0]); 143 EXPECT_EQ(std::string("app1"), apps[0]);
144 EXPECT_EQ(extension_misc::kChromeAppId, apps[1]); 144 EXPECT_EQ(extension_misc::kChromeAppId, apps[1]);
145 EXPECT_EQ(std::string("app2"), 145 EXPECT_EQ(std::string("app2"),
146 apps[default_app_order::kDefaultAppOrderCount + 1]); 146 apps[default_app_order::kDefaultAppOrderCount + 1]);
147 } 147 }
148 148
149 } // namespace chromeos 149 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698