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

Side by Side Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

Issue 48643003: Moved extension and value builder code to extensions component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again Created 7 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "chrome/browser/extensions/activity_log/activity_log.h" 7 #include "chrome/browser/extensions/activity_log/activity_log.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/extensions/extension_builder.h" 10 #include "extensions/common/extension_builder.h"
11 #include "net/dns/mock_host_resolver.h" 11 #include "net/dns/mock_host_resolver.h"
12 #include "net/test/embedded_test_server/embedded_test_server.h" 12 #include "net/test/embedded_test_server/embedded_test_server.h"
13 #include "net/test/embedded_test_server/http_request.h" 13 #include "net/test/embedded_test_server/http_request.h"
14 #include "net/test/embedded_test_server/http_response.h" 14 #include "net/test/embedded_test_server/http_response.h"
15 15
16 using net::test_server::BasicHttpResponse; 16 using net::test_server::BasicHttpResponse;
17 using net::test_server::HttpResponse; 17 using net::test_server::HttpResponse;
18 using net::test_server::HttpRequest; 18 using net::test_server::HttpRequest;
19 19
20 namespace extensions { 20 namespace extensions {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 const Extension* friend_extension = LoadExtensionIncognito( 68 const Extension* friend_extension = LoadExtensionIncognito(
69 test_data_dir_.AppendASCII("activity_log_private/friend")); 69 test_data_dir_.AppendASCII("activity_log_private/friend"));
70 ASSERT_TRUE(friend_extension); 70 ASSERT_TRUE(friend_extension);
71 ASSERT_TRUE(RunExtensionTest("activity_log_private/test")); 71 ASSERT_TRUE(RunExtensionTest("activity_log_private/test"));
72 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false); 72 ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false);
73 } 73 }
74 74
75 } // namespace extensions 75 } // namespace extensions
76 76
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698