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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/testing/gtest/include/gtest/gtest.h

Issue 2224323003: WIP roll gtest/gmock DEPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/gtest_nacl.gyp ('k') | testing/testing/gtest/include/gtest/gtest-death-test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/testing/gtest/include/gtest/gtest.h
diff --git a/chrome/browser/resources/settings/printing_page/cups_printers.js b/testing/testing/gtest/include/gtest/gtest.h
similarity index 73%
copy from chrome/browser/resources/settings/printing_page/cups_printers.js
copy to testing/testing/gtest/include/gtest/gtest.h
index 7472b1f0d9a0dc654bf4f187ac8631d5a6b2a3fc..870f640b3bf0519a965cc9cb8b3b5beea0fbe736 100644
--- a/chrome/browser/resources/settings/printing_page/cups_printers.js
+++ b/testing/testing/gtest/include/gtest/gtest.h
@@ -2,6 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-Polymer({
- is: 'settings-cups-printers',
-});
+#include "third_party/gtest/googletest/include/gtest/gtest.h"
« no previous file with comments | « testing/gtest_nacl.gyp ('k') | testing/testing/gtest/include/gtest/gtest-death-test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698