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

Side by Side Diff: chrome/browser/chromeos/gdata/drive_webapps_registry_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/json/json_file_value_serializer.h" 7 #include "base/json/json_file_value_serializer.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h" 13 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
14 #include "chrome/browser/chromeos/gdata/gdata_parser.h" 14 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "content/test/test_browser_thread.h" 16 #include "content/public/test/test_browser_thread.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using base::Value; 19 using base::Value;
20 using base::DictionaryValue; 20 using base::DictionaryValue;
21 using base::ListValue; 21 using base::ListValue;
22 22
23 namespace gdata { 23 namespace gdata {
24 24
25 class DriveWebAppsRegistryTest : public testing::Test { 25 class DriveWebAppsRegistryTest : public testing::Test {
26 protected: 26 protected:
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 ScopedVector<DriveWebAppInfo> mime_ext_results; 126 ScopedVector<DriveWebAppInfo> mime_ext_results;
127 FilePath mime_file(FILE_PATH_LITERAL("gdata/MimeFile.ext_2")); 127 FilePath mime_file(FILE_PATH_LITERAL("gdata/MimeFile.ext_2"));
128 web_apps->GetWebAppsForFile(mime_file, "application/test_type_2", 128 web_apps->GetWebAppsForFile(mime_file, "application/test_type_2",
129 &mime_ext_results); 129 &mime_ext_results);
130 ASSERT_EQ(2U, mime_ext_results.size()); 130 ASSERT_EQ(2U, mime_ext_results.size());
131 VerifyApp1(mime_ext_results, true); 131 VerifyApp1(mime_ext_results, true);
132 VerifyApp2(mime_ext_results, true); 132 VerifyApp2(mime_ext_results, true);
133 } 133 }
134 134
135 } // namespace gdata 135 } // namespace gdata
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698