| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_ | 5 #ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_TEST_UTIL_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_ | 6 #define CHROME_BROWSER_GOOGLE_APIS_GDATA_TEST_UTIL_H_ |
| 7 | 7 |
| 8 #include "chrome/browser/chromeos/gdata/gdata_test_util.h" | 8 #include "chrome/browser/google_apis/gdata_test_util.h" |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 | 13 |
| 14 class FilePath; | 14 class FilePath; |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 class Value; | 17 class Value; |
| 18 } | 18 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 33 // chrome/test/data/chromeos. | 33 // chrome/test/data/chromeos. |
| 34 FilePath GetTestFilePath(const std::string& relative_path); | 34 FilePath GetTestFilePath(const std::string& relative_path); |
| 35 | 35 |
| 36 // Loads a test JSON file as a base::Value, from a test file stored under | 36 // Loads a test JSON file as a base::Value, from a test file stored under |
| 37 // chrome/test/data/chromeos. | 37 // chrome/test/data/chromeos. |
| 38 scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path); | 38 scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path); |
| 39 | 39 |
| 40 } // namespace test_util | 40 } // namespace test_util |
| 41 } // namespace gdata | 41 } // namespace gdata |
| 42 | 42 |
| 43 #endif // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_TEST_UTIL_H_ | 43 #endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_TEST_UTIL_H_ |
| OLD | NEW |